From bb2f2a6f5407fff99818770b3a4c0812accb4ddd Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 24 Apr 2015 12:48:39 +1000 Subject: [PATCH 1/2] Also stop delayed job before loading staging baseline --- script/ci/load_staging_baseline.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/ci/load_staging_baseline.sh b/script/ci/load_staging_baseline.sh index c5408b1328..2fe132a0e5 100755 --- a/script/ci/load_staging_baseline.sh +++ b/script/ci/load_staging_baseline.sh @@ -9,8 +9,9 @@ source ./script/ci/includes.sh cd /home/openfoodweb/apps/openfoodweb/current -echo "Stopping unicorn..." +echo "Stopping unicorn and delayed job..." service unicorn_openfoodweb stop +RAILS_ENV=staging script/delayed_job -i 0 stop echo "Backing up current data..." mkdir -p db/backup @@ -22,5 +23,6 @@ gunzip -c db/backup/staging-baseline.sql.gz |psql -h localhost -U openfoodweb op echo "Restarting unicorn..." service unicorn_openfoodweb start +# Delayed job is restarted by monit echo "Done!" From 8e2c224d4db605091c140d2e621a7289a99dea58 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 24 Apr 2015 15:00:49 +1000 Subject: [PATCH 2/2] cd before sourcing includes --- script/ci/load_staging_baseline.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/ci/load_staging_baseline.sh b/script/ci/load_staging_baseline.sh index 2fe132a0e5..ac7d88569f 100755 --- a/script/ci/load_staging_baseline.sh +++ b/script/ci/load_staging_baseline.sh @@ -5,9 +5,8 @@ # current database. set -e -source ./script/ci/includes.sh - cd /home/openfoodweb/apps/openfoodweb/current +source ./script/ci/includes.sh echo "Stopping unicorn and delayed job..." service unicorn_openfoodweb stop