Download as
Browse Code »

Commit 8c6988805ef1474bfd7dcd8f92524f9eaf971eb8

Authored by Antonio Terceiro
2 parents bf2cbbd3 348b6cb5
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'whenever-multitenancy' into 'master' 

Fixes whenever in production for a multitenancy setup

Each cronjob has to run for all production environments. Currently they are
only running for the environment named production so it doesn't work in a
multitenancy setup.

I use `whenever --update-crontab` to append jobs for each environment, using the 
environment name as a whenever identifier, and then I have to clean the crontab of each
environment generated jobs using the same identifier.

See merge request !705
Showing 2 changed files with 26 additions and 3 deletions   Show diff stats
script/production
  Diff comments   View file @8c69888
... ... @@ -48,7 +48,6 @@ do_start() {
48 48 bundle exec rake db:migrate SCHEMA=/dev/null
49 49 clear_cache
50 50 environments_loop start
51   - bundle exec whenever --write-crontab --set 'environment=production'
52 51 app_server_start
53 52 }
54 53  
... ... @@ -63,8 +62,6 @@ do_stop() {
63 62  
64 63 environments_loop stop ||
65 64 stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid
66   -
67   - bundle exec whenever --clear-crontab
68 65 }
69 66  
70 67 do_restart() {
... ... @@ -97,10 +94,12 @@ environments_loop() {
97 94 env=$(basename $environment | cut -d. -f1)
98 95 RAILS_ENV=$env bundle exec ./script/delayed_job -i $env "$action"
99 96 RAILS_ENV=$env bundle exec ./script/feed-updater "$action" -i $env
  97 + ./script/whenever $action $env
100 98 done
101 99 else
102 100 bundle exec ./script/delayed_job "$action"
103 101 bundle exec ./script/feed-updater "$action"
  102 + ./script/whenever $action
104 103 fi
105 104 }
106 105  
... ...
script/whenever 0 → 100755
  Diff comments   View file @8c69888
... ... @@ -0,0 +1,24 @@
  1 +#!/bin/sh
  2 +
  3 +ACTION="$1"
  4 +ENV="$2"
  5 +if [ -z "$ENV" ]; then
  6 + ENV='production'
  7 +fi
  8 +
  9 +do_start(){
  10 + bundle exec whenever --update-crontab $ENV --set "environment=$ENV"
  11 +}
  12 +
  13 +do_stop(){
  14 + bundle exec whenever --clear-crontab $ENV
  15 +}
  16 +case "$ACTION" in
  17 + start|stop)
  18 + do_$ACTION
  19 + ;;
  20 + *)
  21 + echo "usage: $0 start|stop [environment]"
  22 + exit 1
  23 + ;;
  24 +esac
... ...