From 156b173041b03b8becc26cb416a8eaad2dff331c Mon Sep 17 00:00:00 2001 From: "(skovati) Luke" Date: Tue, 19 Mar 2024 16:16:18 -0700 Subject: [PATCH 1/2] enable continuous validation thread by default --- .../java/gov/nasa/jpl/aerie/merlin/server/AerieAppDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/AerieAppDriver.java b/merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/AerieAppDriver.java index 0da35c7219..81b0289bab 100644 --- a/merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/AerieAppDriver.java +++ b/merlin-server/src/main/java/gov/nasa/jpl/aerie/merlin/server/AerieAppDriver.java @@ -180,7 +180,7 @@ private static AppConfiguration loadConfiguration() { Instant.parse(getEnv("UNTRUE_PLAN_START", "")), URI.create(getEnv("HASURA_GRAPHQL_URL", "http://localhost:8080/v1/graphql")), getEnv("HASURA_GRAPHQL_ADMIN_SECRET", ""), - Boolean.parseBoolean(getEnv("ENABLE_CONTINUOUS_VALIDATION_THREAD", "false")), + Boolean.parseBoolean(getEnv("ENABLE_CONTINUOUS_VALIDATION_THREAD", "true")), Integer.parseInt(getEnv("VALIDATION_THREAD_POLLING_PERIOD", "500")) ); } From 53c20bd7913c755653bee3ae9fe69a65e6478888 Mon Sep 17 00:00:00 2001 From: "(skovati) Luke" Date: Tue, 19 Mar 2024 16:19:02 -0700 Subject: [PATCH 2/2] remove `ENABLE_CONTINUOUS_VALIDATION_THREAD: true` from docker-compose.yml this is now the default behavior --- deployment/docker-compose.yml | 1 - docker-compose.yml | 1 - e2e-tests/docker-compose-test.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index 2733516e79..18f0d4748e 100755 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -35,7 +35,6 @@ services: MERLIN_DB_USER: "${AERIE_USERNAME}" MERLIN_LOCAL_STORE: /usr/src/app/merlin_file_store MERLIN_PORT: 27183 - ENABLE_CONTINUOUS_VALIDATION_THREAD: true JAVA_OPTS: > -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dorg.slf4j.simpleLogger.logFile=System.err diff --git a/docker-compose.yml b/docker-compose.yml index a1c323f1ad..9e1f6a80cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,6 @@ services: -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=INFO -Dorg.slf4j.simpleLogger.logFile=System.err UNTRUE_PLAN_START: "2000-01-01T11:58:55.816Z" - ENABLE_CONTINUOUS_VALIDATION_THREAD: true image: aerie_merlin ports: ["27183:27183", "5005:5005"] restart: always diff --git a/e2e-tests/docker-compose-test.yml b/e2e-tests/docker-compose-test.yml index 14a3fa991b..4d2c8f1867 100644 --- a/e2e-tests/docker-compose-test.yml +++ b/e2e-tests/docker-compose-test.yml @@ -46,7 +46,6 @@ services: -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=INFO -Dorg.slf4j.simpleLogger.logFile=System.err UNTRUE_PLAN_START: '2000-01-01T11:58:55.816Z' - ENABLE_CONTINUOUS_VALIDATION_THREAD: true image: aerie_merlin ports: ['27183:27183', '5005:5005'] restart: always