Always check if sane environment is provided, even if conf file is missing. Closes #206

vvalchev · vvalchev · commit 8c42f7befcdf · 2020-07-28T15:53:43.000+03:00
#206
diff --git a/scripts/load-config b/scripts/load-config
@@ -10,41 +10,42 @@ if [[ -v CONFIG_FILE ]]; then
 
     source $CONFIG_FILE # Source the configuration file.
 
-    # Now set defaults if needed...
-
-    # Rails Environment
-    export RAILS_ENV=${RAILS_ENV:-production}
-    export RAILS_MAX_THREADS=${RAILS_MAX_THREADS:-5}
-    export RAILS_SERVER_PROCESSES=${RAILS_SERVER_PROCESSES:-1}
-    export SECRET_KEY_BASE=${SECRET_KEY_BASE:-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 128 | head -n 1)}
-    export MAINTENANCE_MESSAGE=${MAINTENANCE_MESSAGE:-Judge0 is currently in maintenance.}
-    export PORT=${PORT:-3000} # This option is not available in judge0.conf
-    export RAILS_LOG_TO_STDOUT=true # This options is not available in judge0.conf
-
-    # Authentication
-    export AUTHN_HEADER=${AUTHN_HEADER:-X-Auth-Token}
-
-    # Authorization
-    export AUTHZ_HEADER=${AUTHZ_HEADER:-X-Auth-User}
-
-    # Workers
-    export INTERVAL=${INTERVAL:-0.1}
-    export COUNT=${COUNT:-1}
-    export QUEUE=${JUDGE0_VERSION:-unknown} # This option is not available in judge0.conf
-
-    # Database
-    export REDIS_HOST=${REDIS_HOST:-localhost}
-    export REDIS_PORT=${REDIS_PORT:-6379}
-    export POSTGRES_HOST=${POSTGRES_HOST:-localhost}
-    export POSTGRES_PORT=${POSTGRES_PORT:-5432}
-    export POSTGRES_DB=${POSTGRES_DB:-postgres}
-    export POSTGRES_USER=${POSTGRES_USER:-postgres}
-
-    # Other
-    export RUBYOPT=-W:no-deprecated
-    export DISABLE_DATABASE_ENVIRONMENT_CHECK=1
-
     set +o allexport
-
-    export > /api/tmp/environment
 fi
+
+# Now set defaults if needed...
+
+# Rails Environment
+export RAILS_ENV=${RAILS_ENV:-production}
+export RAILS_MAX_THREADS=${RAILS_MAX_THREADS:-5}
+export RAILS_SERVER_PROCESSES=${RAILS_SERVER_PROCESSES:-1}
+export SECRET_KEY_BASE=${SECRET_KEY_BASE:-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 128 | head -n 1)}
+export MAINTENANCE_MESSAGE=${MAINTENANCE_MESSAGE:-Judge0 is currently in maintenance.}
+export PORT=${PORT:-3000} # This option is not available in judge0.conf
+export RAILS_LOG_TO_STDOUT=true # This options is not available in judge0.conf
+
+# Authentication
+export AUTHN_HEADER=${AUTHN_HEADER:-X-Auth-Token}
+
+# Authorization
+export AUTHZ_HEADER=${AUTHZ_HEADER:-X-Auth-User}
+
+# Workers
+export INTERVAL=${INTERVAL:-0.1}
+export COUNT=${COUNT:-1}
+export QUEUE=${JUDGE0_VERSION:-unknown} # This option is not available in judge0.conf
+
+# Database
+export REDIS_HOST=${REDIS_HOST:-localhost}
+export REDIS_PORT=${REDIS_PORT:-6379}
+export POSTGRES_HOST=${POSTGRES_HOST:-localhost}
+export POSTGRES_PORT=${POSTGRES_PORT:-5432}
+export POSTGRES_DB=${POSTGRES_DB:-postgres}
+export POSTGRES_USER=${POSTGRES_USER:-postgres}
+
+# Other
+export RUBYOPT=-W:no-deprecated
+export DISABLE_DATABASE_ENVIRONMENT_CHECK=1
+
+
+export > /api/tmp/environment
