diff --git a/code/api/executor-api/src/main/java/nu/marginalia/executor/model/ActorRunState.java b/code/api/executor-api/src/main/java/nu/marginalia/executor/model/ActorRunState.java index a6137484..00a1477b 100644 --- a/code/api/executor-api/src/main/java/nu/marginalia/executor/model/ActorRunState.java +++ b/code/api/executor-api/src/main/java/nu/marginalia/executor/model/ActorRunState.java @@ -14,7 +14,7 @@ public record ActorRunState(String name, public String stateIcon() { if (terminal) { - return "\uD83D\uDE34"; + return "\uD83D\uDC80"; // Unicode Skull } else if (state.equals("MONITOR")) { return "\uD83D\uDD26"; diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java b/code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java index 2fc0f296..1c15599d 100644 --- a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java +++ b/code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java @@ -319,12 +319,18 @@ public class ControlNodeService { private Object nodeOverviewModel(Request request, Response response) throws SQLException { int nodeId = Integer.parseInt(request.params("id")); var config = nodeConfigurationService.get(nodeId); + + var actors = executorClient.getActorStates(Context.fromRequest(request), nodeId).states(); + + actors.removeIf(actor -> actor.state().equals("MONITOR")); + return Map.of( "node", new IndexNode(nodeId), "status", getStatus(config), "events", getEvents(nodeId), "processes", heartbeatService.getProcessHeartbeatsForNode(nodeId), "jobs", heartbeatService.getTaskHeartbeatsForNode(nodeId), + "actors", actors, "tab", Map.of("overview", true) ); } diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-overview.hdb b/code/services-core/control-service/src/main/resources/templates/control/node/node-overview.hdb index 60699930..c785fb7f 100644 --- a/code/services-core/control-service/src/main/resources/templates/control/node/node-overview.hdb +++ b/code/services-core/control-service/src/main/resources/templates/control/node/node-overview.hdb @@ -11,6 +11,7 @@