diff --git a/code/common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java b/code/common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java index 19e58bc4..da4f0fe4 100644 --- a/code/common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java +++ b/code/common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java @@ -10,7 +10,6 @@ import nu.marginalia.client.exception.LocalException; import nu.marginalia.client.exception.NetworkException; import nu.marginalia.client.exception.RemoteException; import nu.marginalia.client.exception.RouteNotConfiguredException; -import nu.marginalia.client.route.ServiceRoute; import nu.marginalia.client.route.RouteProvider; import nu.marginalia.client.route.ServiceRoutes; import nu.marginalia.service.descriptor.ServiceDescriptor; @@ -20,7 +19,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.net.ConnectException; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; diff --git a/code/common/service-client/src/main/java/nu/marginalia/client/EndpointLivenessMonitor.java b/code/common/service-client/src/main/java/nu/marginalia/client/EndpointLivenessMonitor.java index 0b589a6c..4c98b28c 100644 --- a/code/common/service-client/src/main/java/nu/marginalia/client/EndpointLivenessMonitor.java +++ b/code/common/service-client/src/main/java/nu/marginalia/client/EndpointLivenessMonitor.java @@ -31,6 +31,7 @@ public class EndpointLivenessMonitor { @SneakyThrows public void run() { Thread.sleep(100); // Wait for initialization + try { while (!Thread.interrupted()) { if (updateLivenessMap()) { diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertActor.java b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertActor.java index d9867e86..1d13ed45 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertActor.java +++ b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertActor.java @@ -92,7 +92,7 @@ public class ConvertActor extends AbstractActorPrototype { // Create processed data area var toProcess = storageService.getStorage(sourceStorageId); - var base = storageService.getStorageBase(FileStorageBaseType.WORK); + var base = storageService.getStorageBase(FileStorageBaseType.STORAGE); var processedArea = storageService.allocateTemporaryStorage(base, FileStorageType.PROCESSED_DATA, "processed-data", "Processed Data; " + toProcess.description()); @@ -125,7 +125,7 @@ public class ConvertActor extends AbstractActorPrototype { String fileName = sourcePath.toFile().getName(); - var base = storageService.getStorageBase(FileStorageBaseType.WORK); + var base = storageService.getStorageBase(FileStorageBaseType.STORAGE); var processedArea = storageService.allocateTemporaryStorage(base, FileStorageType.PROCESSED_DATA, "processed-data", "Processed Encylopedia Data; " + fileName); @@ -157,7 +157,7 @@ public class ConvertActor extends AbstractActorPrototype { String fileName = sourcePath.toFile().getName(); - var base = storageService.getStorageBase(FileStorageBaseType.WORK); + var base = storageService.getStorageBase(FileStorageBaseType.STORAGE); var processedArea = storageService.allocateTemporaryStorage(base, FileStorageType.PROCESSED_DATA, "processed-data", "Processed Dirtree Data; " + fileName); @@ -188,7 +188,7 @@ public class ConvertActor extends AbstractActorPrototype { String fileName = sourcePath.toFile().getName(); - var base = storageService.getStorageBase(FileStorageBaseType.WORK); + var base = storageService.getStorageBase(FileStorageBaseType.STORAGE); var processedArea = storageService.allocateTemporaryStorage(base, FileStorageType.PROCESSED_DATA, "processed-data", "Processed Stackexchange Data; " + fileName); diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java index e13cb22e..e7f44742 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java +++ b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java @@ -126,7 +126,7 @@ public class ConvertAndLoadActor extends AbstractActorPrototype { var toProcess = storageService.getStorage(message.crawlStorageId); - var base = storageService.getStorageBase(FileStorageBaseType.WORK); + var base = storageService.getStorageBase(FileStorageBaseType.STORAGE); var processedArea = storageService.allocateTemporaryStorage(base, FileStorageType.PROCESSED_DATA, "processed-data", "Processed Data; " + toProcess.description()); diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlActor.java b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlActor.java index 04b75f84..94c7823a 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlActor.java +++ b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlActor.java @@ -98,7 +98,7 @@ public class CrawlActor extends AbstractActorPrototype { var toCrawl = storageService.getStorage(message.crawlSpecId); - var base = storageService.getStorageBase(FileStorageBaseType.WORK); + var base = storageService.getStorageBase(FileStorageBaseType.STORAGE); var dataArea = storageService.allocateTemporaryStorage( base, FileStorageType.CRAWL_DATA, diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java index ebe01f04..cc7a5658 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java +++ b/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java @@ -65,7 +65,7 @@ public class CrawlJobExtractorActor extends AbstractActorPrototype { error("This actor requires a CrawlJobExtractorArgumentsWithURL argument"); } - var base = fileStorageService.getStorageBase(FileStorageBaseType.WORK); + var base = fileStorageService.getStorageBase(FileStorageBaseType.STORAGE); var storage = fileStorageService.allocateTemporaryStorage(base, FileStorageType.CRAWL_SPEC, "crawl-spec", arg.description()); Path urlsTxt = storage.asPath().resolve("urls.txt"); @@ -102,7 +102,7 @@ public class CrawlJobExtractorActor extends AbstractActorPrototype { error("This actor requires a CrawlJobExtractorArguments argument"); } - var base = fileStorageService.getStorageBase(FileStorageBaseType.WORK); + var base = fileStorageService.getStorageBase(FileStorageBaseType.STORAGE); var storage = fileStorageService.allocateTemporaryStorage(base, FileStorageType.CRAWL_SPEC, "crawl-spec", arg.description()); final Path path = CrawlSpecFileNames.resolve(storage); 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 f1af8de1..0aebe2db 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 @@ -156,12 +156,13 @@ public class ControlNodeService { final String description = request.queryParams("description"); final String url = request.queryParams("url"); final String source = request.queryParams("source"); + int nodeId = Integer.parseInt(request.params("id")); if ("db".equals(source)) { - executorClient.createCrawlSpecFromDb(Context.fromRequest(request), 0, description); + executorClient.createCrawlSpecFromDb(Context.fromRequest(request), nodeId, description); } else if ("download".equals(source)) { - executorClient.createCrawlSpecFromDownload(Context.fromRequest(request), 0, description, url); + executorClient.createCrawlSpecFromDownload(Context.fromRequest(request), nodeId, description, url); } else { throw new IllegalArgumentException("Unknown source: " + source); diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-actions.hdb b/code/services-core/control-service/src/main/resources/templates/control/node/node-actions.hdb index 807078f7..abe55941 100644 --- a/code/services-core/control-service/src/main/resources/templates/control/node/node-actions.hdb +++ b/code/services-core/control-service/src/main/resources/templates/control/node/node-actions.hdb @@ -6,7 +6,13 @@ {{> control/partials/nav}}
-

Index Node {{node.id}}

+ +