Commit 9aeb65d143f9ddf085810a70f657be0cd0c88ac4
1 parent
8f51a74f
Exists in
master
and in
28 other branches
Correctly stop daemons in multi-tenant setups
(ActionItem2300)
Showing
1 changed file
with
8 additions
and
10 deletions
Show diff stats
script/production
@@ -32,7 +32,7 @@ do_start() { | @@ -32,7 +32,7 @@ do_start() { | ||
32 | 32 | ||
33 | clear_cache | 33 | clear_cache |
34 | ./script/ferret_server -e $RAILS_ENV start | 34 | ./script/ferret_server -e $RAILS_ENV start |
35 | - environments_loop | 35 | + environments_loop start |
36 | mongrel_rails cluster::start | 36 | mongrel_rails cluster::start |
37 | } | 37 | } |
38 | 38 | ||
@@ -46,11 +46,8 @@ do_stop() { | @@ -46,11 +46,8 @@ do_stop() { | ||
46 | mongrel_rails cluster::stop || | 46 | mongrel_rails cluster::stop || |
47 | stop_via_pid_file tmp/pids/mongrel.*.pid | 47 | stop_via_pid_file tmp/pids/mongrel.*.pid |
48 | 48 | ||
49 | - ./script/delayed_job stop || | ||
50 | - stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid | ||
51 | - | ||
52 | - ./script/feed-updater stop || | ||
53 | - stop_via_pid_file tmp/pids/feed-updater.*.pid | 49 | + environments_loop stop || |
50 | + stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid | ||
54 | 51 | ||
55 | ./script/ferret_server -e $RAILS_ENV stop || | 52 | ./script/ferret_server -e $RAILS_ENV stop || |
56 | stop_via_pid_file tmp/pids/ferret.production.pid | 53 | stop_via_pid_file tmp/pids/ferret.production.pid |
@@ -68,16 +65,17 @@ stop_via_pid_file() { | @@ -68,16 +65,17 @@ stop_via_pid_file() { | ||
68 | } | 65 | } |
69 | 66 | ||
70 | environments_loop() { | 67 | environments_loop() { |
68 | + action="$1" | ||
71 | environments=$(find ./config/environments -name *_$RAILS_ENV.rb) | 69 | environments=$(find ./config/environments -name *_$RAILS_ENV.rb) |
72 | if [ "$environments" ]; then | 70 | if [ "$environments" ]; then |
73 | for environment in $environments; do | 71 | for environment in $environments; do |
74 | env=$(basename $environment | cut -d. -f1) | 72 | env=$(basename $environment | cut -d. -f1) |
75 | - RAILS_ENV=$env ./script/delayed_job -i $env start | ||
76 | - RAILS_ENV=$env ./script/feed-updater start -i $env | 73 | + RAILS_ENV=$env ./script/delayed_job -i $env "$action" |
74 | + RAILS_ENV=$env ./script/feed-updater "$action" -i $env | ||
77 | done | 75 | done |
78 | else | 76 | else |
79 | - ./script/delayed_job start | ||
80 | - ./script/feed-updater start | 77 | + ./script/delayed_job "$action" |
78 | + ./script/feed-updater "$action" | ||
81 | fi | 79 | fi |
82 | } | 80 | } |
83 | 81 |