Commit f462e4623e40130b4b1b581a11c95819a21324d2
Exists in
staging
and in
42 other branches
Merge commit 'refs/merge-requests/139' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/139
Showing
1 changed file
with
8 additions
and
10 deletions
Show diff stats
script/production
| ... | ... | @@ -32,7 +32,7 @@ do_start() { |
| 32 | 32 | |
| 33 | 33 | clear_cache |
| 34 | 34 | ./script/ferret_server -e $RAILS_ENV start |
| 35 | - environments_loop | |
| 35 | + environments_loop start | |
| 36 | 36 | mongrel_rails cluster::start |
| 37 | 37 | } |
| 38 | 38 | |
| ... | ... | @@ -46,11 +46,8 @@ do_stop() { |
| 46 | 46 | mongrel_rails cluster::stop || |
| 47 | 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 | |
| 51 | - | |
| 52 | - ./script/feed-updater stop || | |
| 53 | - stop_via_pid_file tmp/pids/feed-updater.default.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 | 52 | ./script/ferret_server -e $RAILS_ENV stop || |
| 56 | 53 | stop_via_pid_file tmp/pids/ferret.production.pid |
| ... | ... | @@ -68,16 +65,17 @@ stop_via_pid_file() { |
| 68 | 65 | } |
| 69 | 66 | |
| 70 | 67 | environments_loop() { |
| 68 | + action="$1" | |
| 71 | 69 | environments=$(find ./config/environments -name *_$RAILS_ENV.rb) |
| 72 | 70 | if [ "$environments" ]; then |
| 73 | 71 | for environment in $environments; do |
| 74 | 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 | 75 | done |
| 78 | 76 | else |
| 79 | - ./script/delayed_job start | |
| 80 | - ./script/feed-updater start | |
| 77 | + ./script/delayed_job "$action" | |
| 78 | + ./script/feed-updater "$action" | |
| 81 | 79 | fi |
| 82 | 80 | } |
| 83 | 81 | ... | ... |