From 9aeb65d143f9ddf085810a70f657be0cd0c88ac4 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Mon, 5 Mar 2012 12:11:28 -0300
Subject: [PATCH] Correctly stop daemons in multi-tenant setups

---
 script/production | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/script/production b/script/production
index 2e7b235..1d282c4 100755
--- a/script/production
+++ b/script/production
@@ -32,7 +32,7 @@ do_start() {
 
   clear_cache
   ./script/ferret_server -e $RAILS_ENV start
-  environments_loop
+  environments_loop start
   mongrel_rails cluster::start
 }
 
@@ -46,11 +46,8 @@ do_stop() {
   mongrel_rails cluster::stop ||
     stop_via_pid_file tmp/pids/mongrel.*.pid
 
-  ./script/delayed_job stop ||
-    stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid
-
-  ./script/feed-updater stop ||
-    stop_via_pid_file tmp/pids/feed-updater.*.pid
+  environments_loop stop ||
+    stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid
 
   ./script/ferret_server -e $RAILS_ENV stop ||
     stop_via_pid_file tmp/pids/ferret.production.pid
@@ -68,16 +65,17 @@ stop_via_pid_file() {
 }
 
 environments_loop() {
+  action="$1"
   environments=$(find ./config/environments -name *_$RAILS_ENV.rb)
   if [ "$environments" ]; then
     for environment in $environments; do
       env=$(basename $environment | cut -d. -f1)
-      RAILS_ENV=$env ./script/delayed_job -i $env start
-      RAILS_ENV=$env ./script/feed-updater start -i $env
+      RAILS_ENV=$env ./script/delayed_job -i $env "$action"
+      RAILS_ENV=$env ./script/feed-updater "$action" -i $env
     done
   else
-    ./script/delayed_job start
-    ./script/feed-updater start
+    ./script/delayed_job "$action"
+    ./script/feed-updater "$action"
   fi
 }
 
--
libgit2 0.21.2