From 8128959f2b12962e1d6c9b98789cd5c00c810ed4 Mon Sep 17 00:00:00 2001 From: Ezequiel Valencia Date: Tue, 3 Jun 2025 12:37:16 -0400 Subject: [PATCH 1/2] Make All Server Modules use Property Loader --- .../org/vcell/rest/server/OptimizationRunServerResource.java | 2 +- .../vcell/message/server/batch/sim/HtcSimulationWorker.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java b/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java index cff4293455..5db4c49318 100644 --- a/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java +++ b/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java @@ -180,7 +180,7 @@ private OptSocketStreams createOptSocketStreams() throws IOException, Interrupte String swarmSubmitTaskName = PropertyLoader.getProperty(PropertyLoader.vcellsubmit_service_host, null); if (swarmSubmitTaskName == null){ // if not provided, then calculate the DNS name of the docker swarm service for vcell-submit - swarmSubmitTaskName = "tasks."+"vcell"+System.getProperty("vcell.server.id").toLowerCase()+"_submit"; + swarmSubmitTaskName = "tasks."+"vcell"+PropertyLoader.getRequiredProperty("vcell.server.id").toLowerCase()+"_submit"; } ProcessBuilder pb =new ProcessBuilder("nslookup",swarmSubmitTaskName); pb.redirectErrorStream(true); diff --git a/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java b/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java index 63575003d7..180501b0b4 100644 --- a/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java +++ b/vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java @@ -255,7 +255,7 @@ public String toString() { } private static String MONITOR_JOBS_FILE_NAME = "monitorJobsList"; -private static File monitorJobsFile = new File(System.getProperty(PropertyLoader.primarySimDataDirInternalProperty), MONITOR_JOBS_FILE_NAME+"_"+System.getProperty(PropertyLoader.vcellServerIDProperty)+".txt"); +private static File monitorJobsFile = new File(PropertyLoader.getRequiredProperty(PropertyLoader.primarySimDataDirInternalProperty), MONITOR_JOBS_FILE_NAME+"_"+PropertyLoader.getRequiredProperty(PropertyLoader.vcellServerIDProperty)+".txt"); private static Hashtable getMonitorJobs(){ Hashtable result = new Hashtable<>(); ArrayList theseJobsAreDone = new ArrayList<>(); From 37f2bf5c06868397ddb5318836e437f21e7c27a1 Mon Sep 17 00:00:00 2001 From: Ezequiel Valencia Date: Thu, 5 Jun 2025 11:09:59 -0400 Subject: [PATCH 2/2] Use Named Literals --- .../org/vcell/rest/server/OptimizationRunServerResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java b/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java index 5db4c49318..80774f2cdb 100644 --- a/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java +++ b/vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java @@ -180,7 +180,7 @@ private OptSocketStreams createOptSocketStreams() throws IOException, Interrupte String swarmSubmitTaskName = PropertyLoader.getProperty(PropertyLoader.vcellsubmit_service_host, null); if (swarmSubmitTaskName == null){ // if not provided, then calculate the DNS name of the docker swarm service for vcell-submit - swarmSubmitTaskName = "tasks."+"vcell"+PropertyLoader.getRequiredProperty("vcell.server.id").toLowerCase()+"_submit"; + swarmSubmitTaskName = "tasks."+"vcell"+PropertyLoader.getRequiredProperty(PropertyLoader.vcellServerIDProperty).toLowerCase()+"_submit"; } ProcessBuilder pb =new ProcessBuilder("nslookup",swarmSubmitTaskName); pb.redirectErrorStream(true);