diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-01-05 15:19:28 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-01-05 15:19:28 +0000 |
commit | 779167759d32de1a6ae3b6caa8350270f72e83bb (patch) | |
tree | 3212d5c3e08d456bd6f0116dc007be9a347d3e6f /container-core/src/main/java/com/yahoo/container/jdisc | |
parent | 6cbf34743397d5039dcff4c19893401cfd471cd1 (diff) |
remove runLogctl from this API
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/jdisc')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java index 2594867393a..629bb29a460 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java @@ -21,7 +21,6 @@ import com.yahoo.jdisc.handler.ContentChannel; import com.yahoo.jdisc.handler.ResponseDispatch; import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.http.HttpHeaders; -import com.yahoo.system.ProcessExecuter; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -51,7 +50,6 @@ public class StateHandler extends AbstractRequestHandler { private static final String CONFIG_GENERATION_PATH = "config"; private static final String HEALTH_PATH = "health"; private static final String VERSION_PATH = "version"; - private static final String LOGCTL_PATH = "logctl"; private final static MetricDimensions NULL_DIMENSIONS = StateMetricContext.newInstance(null); private final StateMonitor monitor; @@ -133,7 +131,6 @@ public class StateHandler extends AbstractRequestHandler { case HISTOGRAMS_PATH -> ByteBuffer.wrap(buildHistogramsOutput()); case HEALTH_PATH, METRICS_PATH -> ByteBuffer.wrap(buildMetricOutput(suffix)); case VERSION_PATH -> ByteBuffer.wrap(buildVersionOutput()); - case LOGCTL_PATH -> ByteBuffer.wrap(runLogctl(input)); default -> ByteBuffer.wrap(buildMetricOutput(suffix)); // XXX should possibly do something else here }; } catch (JsonProcessingException e) { @@ -201,48 +198,6 @@ public class StateHandler extends AbstractRequestHandler { return baos.toByteArray(); } - private static byte[] runLogctl(List<ByteBuffer> input) throws JsonProcessingException { - try { - var accumulated = new java.io.ByteArrayOutputStream(); - for (var buf : input) { - if (buf.hasArray()) { - accumulated.write(buf.array(), buf.arrayOffset() + buf.position(), buf.remaining()); - } else { - while (buf.remaining() > 0) { - accumulated.write(buf.get()); - } - } - } - var dec = new com.yahoo.slime.JsonDecoder(); - var slime = dec.decode(new com.yahoo.slime.Slime(), accumulated.toByteArray()); - com.yahoo.slime.Inspector obj = slime.get(); - String component = obj.field("component").asString(); - String levels = obj.field("levels").asString(); - if (component.equals("") || levels.equals("")) { - return toPrettyString(jsonMapper.createObjectNode() - .put("error", "missing component or levels parameter")); - } - String serviceName = System.getenv("VESPA_SERVICE_NAME"); - if (serviceName == null || serviceName.equals("")) { - return toPrettyString(jsonMapper.createObjectNode() - .put("error", "no VESPA_SERVICE_NAME")); - } - var lSpec = new LevelsModSpec(); - lSpec.setLevels(levels); - var command = new String[] { "vespa-logctl", serviceName + ":" + component, lSpec.toLogctlModSpec() }; - var ret = new ProcessExecuter(true).exec(command); - return toPrettyString(jsonMapper.createObjectNode() - .put("exitcode", ret.getFirst()) - .put("output", ret.getSecond())); - } catch (java.io.IOException e) { - return toPrettyString(jsonMapper.createObjectNode() - .put("error", "io exception while running vespa-logctl")); - } catch (IllegalArgumentException e) { - return toPrettyString(jsonMapper.createObjectNode() - .put("error", e.getMessage())); - } - } - private ObjectNode buildJsonForConsumer(String consumer) { ObjectNode ret = jsonMapper.createObjectNode(); ret.put("time", timer.currentTimeMillis()); |