Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(minor) code cleanup

Browse Source
This commit is contained in:
Viktor Lofgren 2023-07-21 14:28:37 +02:00
parent 8f455f3b6d
commit 7bc1cff286
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/services-satellite/control-service/src/main/java/nu/marginalia/control/actor/monitor/AbstractProcessSpawnerActor.java
View File

@ -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 {

4
code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/HeartbeatService.java
View File

@ -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
""")) {

19
code/services-satellite/control-service/src/main/java/nu/marginalia/control/svc/ProcessOutboxFactory.java
View File

@ -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()
);
}
}