From 5a5cc9a50541885a1d446458f1563a52bb2470ea Mon Sep 17 00:00:00 2001 From: Theresa Kamerman Date: Fri, 19 Jul 2024 15:24:48 -0700 Subject: [PATCH] Make Scheduler containers use the correct Envvar It now matches our docs, our docker containers, and is in sync with the rest of Aerie --- .../gov/nasa/jpl/aerie/scheduler/server/SchedulerAppDriver.java | 2 +- .../jpl/aerie/scheduler/worker/SchedulerWorkerAppDriver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/SchedulerAppDriver.java b/scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/SchedulerAppDriver.java index dfffd3f8fe..1e29680460 100644 --- a/scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/SchedulerAppDriver.java +++ b/scheduler-server/src/main/java/gov/nasa/jpl/aerie/scheduler/server/SchedulerAppDriver.java @@ -142,7 +142,7 @@ private static AppConfiguration loadConfiguration() { return new AppConfiguration( Integer.parseInt(getEnv("SCHEDULER_PORT", "27185")), logger.isDebugEnabled(), - new PostgresStore(getEnv("AERIE_DB_SERVER", "postgres"), + new PostgresStore(getEnv("AERIE_DB_HOST", "postgres"), getEnv("SCHEDULER_DB_USER", ""), Integer.parseInt(getEnv("AERIE_DB_PORT", "5432")), getEnv("SCHEDULER_DB_PASSWORD", ""), diff --git a/scheduler-worker/src/main/java/gov/nasa/jpl/aerie/scheduler/worker/SchedulerWorkerAppDriver.java b/scheduler-worker/src/main/java/gov/nasa/jpl/aerie/scheduler/worker/SchedulerWorkerAppDriver.java index e90dff569c..7ce8c8a618 100644 --- a/scheduler-worker/src/main/java/gov/nasa/jpl/aerie/scheduler/worker/SchedulerWorkerAppDriver.java +++ b/scheduler-worker/src/main/java/gov/nasa/jpl/aerie/scheduler/worker/SchedulerWorkerAppDriver.java @@ -137,7 +137,7 @@ private static WorkerAppConfiguration loadConfiguration() { maxNbCachedSimulationEngine = 1; } return new WorkerAppConfiguration( - new PostgresStore(getEnv("AERIE_DB_SERVER", "postgres"), + new PostgresStore(getEnv("AERIE_DB_HOST", "postgres"), getEnv("SCHEDULER_DB_USER", ""), Integer.parseInt(getEnv("AERIE_DB_PORT", "5432")), getEnv("SCHEDULER_DB_PASSWORD", ""),