Skip to content

Make All Server Modules use Property Loader #1524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ezequiel-Valencia merged 2 commits into from
Jun 5, 2025
Merged

Make All Server Modules use Property Loader #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8128959
Make All Server Modules use Property Loader
Ezequiel-Valencia Jun 3, 2025
37f2bf5
Use Named Literals
Ezequiel-Valencia Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(PropertyLoader.vcellServerIDProperty).toLowerCase()+"_submit";
}
ProcessBuilder pb =new ProcessBuilder("nslookup",swarmSubmitTaskName);
pb.redirectErrorStream(true);
Expand Down
2 changes: 1 addition & 1 deletion vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String,MonitorJobInfo> getMonitorJobs(){
Hashtable<String,MonitorJobInfo> result = new Hashtable<>();
ArrayList<String> theseJobsAreDone = new ArrayList<>();
Expand Down
Loading