From 7bc1cff286e5b073743367e7f9b6c02d9b9e576e Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Fri, 21 Jul 2023 14:28:37 +0200 Subject: [PATCH] (minor) code cleanup --- .../monitor/AbstractProcessSpawnerActor.java | 2 ++ .../control/svc/HeartbeatService.java | 4 ++-- .../control/svc/ProcessOutboxFactory.java | 19 +++++++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/actor/monitor/AbstractProcessSpawnerActor.java b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/actor/monitor/AbstractProcessSpawnerActor.java index 35a4ed03..4ff3cde8 100644 --- a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/actor/monitor/AbstractProcessSpawnerActor.java +++ b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/actor/monitor/AbstractProcessSpawnerActor.java @@ -149,6 +149,8 @@ public class AbstractProcessSpawnerActor extends AbstractStateGraph { public void aborted() throws Exception {} + /** Encapsulates the execution of the process in a separate thread so that + * we can interrupt the thread if the process is cancelled */ private class TaskExecution { private final AtomicBoolean error = new AtomicBoolean(false); public TaskExecution() throws ExecutionException, InterruptedException { diff --git a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/HeartbeatService.java b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/HeartbeatService.java index 8a8a693e..74a504b2 100644 --- a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/HeartbeatService.java +++ b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/HeartbeatService.java @@ -28,7 +28,7 @@ public class HeartbeatService { try (var conn = dataSource.getConnection(); var stmt = conn.prepareStatement(""" - SELECT SERVICE_NAME, SERVICE_BASE, INSTANCE, ALIVE, + SELECT SERVICE_NAME, SERVICE_BASE, INSTANCE, ALIVE, TIMESTAMPDIFF(MICROSECOND, HEARTBEAT_TIME, CURRENT_TIMESTAMP(6)) AS TSDIFF FROM SERVICE_HEARTBEAT """)) { @@ -56,7 +56,7 @@ public class HeartbeatService { try (var conn = dataSource.getConnection(); var stmt = conn.prepareStatement(""" - SELECT PROCESS_NAME, PROCESS_BASE, INSTANCE, STATUS, PROGRESS, + SELECT PROCESS_NAME, PROCESS_BASE, INSTANCE, STATUS, PROGRESS, TIMESTAMPDIFF(MICROSECOND, HEARTBEAT_TIME, CURRENT_TIMESTAMP(6)) AS TSDIFF FROM PROCESS_HEARTBEAT """)) { diff --git a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/ProcessOutboxFactory.java b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/ProcessOutboxFactory.java index 52808aef..fb5598a9 100644 --- a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/ProcessOutboxFactory.java +++ b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/ProcessOutboxFactory.java @@ -19,13 +19,24 @@ public class ProcessOutboxFactory { } public MqOutbox createConverterOutbox() { - return new MqOutbox(persistence, ProcessInboxNames.CONVERTER_INBOX, params.configuration.serviceName(), params.configuration.instanceUuid()); + return new MqOutbox(persistence, + ProcessInboxNames.CONVERTER_INBOX, + params.configuration.serviceName(), + params.configuration.instanceUuid() + ); } public MqOutbox createLoaderOutbox() { - return new MqOutbox(persistence, ProcessInboxNames.LOADER_INBOX, params.configuration.serviceName(), params.configuration.instanceUuid()); + return new MqOutbox(persistence, + ProcessInboxNames.LOADER_INBOX, + params.configuration.serviceName(), + params.configuration.instanceUuid() + ); } - public MqOutbox createCrawlerOutbox() { - return new MqOutbox(persistence, ProcessInboxNames.CRAWLER_INBOX, params.configuration.serviceName(), params.configuration.instanceUuid()); + return new MqOutbox(persistence, + ProcessInboxNames.CRAWLER_INBOX, + params.configuration.serviceName(), + params.configuration.instanceUuid() + ); } }