Download as
Browse Code »

Commit 2d571067e8257346adc6d5a32e58d94b22b7cce9

Authored by Antonio Terceiro
1 parent 49ec038d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Stop solr *after* the application server stopped 

Services must be stopped in an order that is the reverse of the order in
which they are started.
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
script/production
  Diff comments   View file @2d57106
@@ -34,8 +34,6 @@ do_start() { @@ -34,8 +34,6 @@ do_start() {
34 } 34 }
35 35
36 do_stop() { 36 do_stop() {
37 - rake -s solr:stop  
38 -  
39 # During Debian upgrades, it is possible that rails is not available (e.g. 37 # During Debian upgrades, it is possible that rails is not available (e.g.
40 # Lenny -> Squeeze), so the programs below might fail. If they do, we fall 38 # Lenny -> Squeeze), so the programs below might fail. If they do, we fall
41 # back to stopping the daemons by manually reading their PID files, killing 39 # back to stopping the daemons by manually reading their PID files, killing
@@ -46,6 +44,8 @@ do_stop() { @@ -46,6 +44,8 @@ do_stop() {
46 44
47 environments_loop stop || 45 environments_loop stop ||
48 stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid 46 stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid
  47 +
  48 + rake -s solr:stop || stop_via_pid_file tmp/pids/solr.*.pid
49 } 49 }
50 50
51 stop_via_pid_file() { 51 stop_via_pid_file() {