Use load-config directly

hermanzdosilovic · hermanzdosilovic · commit ea2fced56d30 · 2024-03-09T11:00:33.000Z
diff --git a/cron/clear_cache b/cron/clear_cache
@@ -1 +1 @@
-0 0 * * * bash -c "source /api/tmp/environment; cd /api; rake judge0:clear_cache &> /api/log/clear_cache.log"
+0 0 * * * bash -c "source /api/environment && cd /api && rake judge0:clear_cache &> ./log/clear_cache.log"
diff --git a/cron/telemetry b/cron/telemetry
@@ -1 +1 @@
-0 */12 * * * bash -c "source /api/tmp/environment; /api/bin/telemetry &> /api/log/telemetry.log"
+0 */12 * * * bash -c "source /api/environment && cd /api && ./bin/telemetry &> ./log/telemetry.log"
diff --git a/scripts/load-config b/scripts/load-config
@@ -49,6 +49,3 @@ export POSTGRES_USER=${POSTGRES_USER:-postgres}
 # Other
 export RUBYOPT=-W:no-deprecated
 export DISABLE_DATABASE_ENVIRONMENT_CHECK=1
-
-
-export > /api/tmp/environment
diff --git a/scripts/server b/scripts/server
@@ -3,9 +3,10 @@
 #
 # Usage: ./scripts/server
 #
-for i in $(seq 1 $RESTART_MAX_TRIES); do
-    source ./scripts/load-config
+source ./scripts/load-config
+export | sudo tee /api/environment
 
+for i in $(seq 1 $RESTART_MAX_TRIES); do
     [[ -f tmp/pids/server.pid ]] && rm -f tmp/pids/server.pid
 
     rails db:create db:migrate db:seed
diff --git a/scripts/workers b/scripts/workers
@@ -4,6 +4,7 @@
 # Usage: ./scripts/workers
 #
 source ./scripts/load-config
+export | sudo tee /api/environment
 
 run_resque=1
 resque_pid=0

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0 0 * * * bash -c "source /api/tmp/environment; cd /api; rake judge0:clear_cache &> /api/log/clear_cache.log"`
	`1`	`+0 0 * * * bash -c "source /api/environment && cd /api && rake judge0:clear_cache &> ./log/clear_cache.log"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0 /12 * * bash -c "source /api/tmp/environment; /api/bin/telemetry &> /api/log/telemetry.log"`
	`1`	`+0 /12 * * bash -c "source /api/environment && cd /api && ./bin/telemetry &> ./log/telemetry.log"`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,10 @@`
`3`	`3`	`#`
`4`	`4`	`# Usage: ./scripts/server`
`5`	`5`	`#`
`6`		`-for i in $(seq 1 $RESTART_MAX_TRIES); do`
`7`		`- source ./scripts/load-config`
	`6`	`+source ./scripts/load-config`
	`7`	`+export \| sudo tee /api/environment`
`8`	`8`
	`9`	`+for i in $(seq 1 $RESTART_MAX_TRIES); do`
`9`	`10`	`[[ -f tmp/pids/server.pid ]] && rm -f tmp/pids/server.pid`
`10`	`11`
`11`	`12`	`rails db:create db:migrate db:seed`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`# Usage: ./scripts/workers`
`5`	`5`	`#`
`6`	`6`	`source ./scripts/load-config`
	`7`	`+export \| sudo tee /api/environment`
`7`	`8`
`8`	`9`	`run_resque=1`
`9`	`10`	`resque_pid=0`