Download as
Browse Code »

Commit 500519946fd09dce6b003153eef0164e25eb05ba

Authored by Braulio Bhavamitra
1 parent 1832d72a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, 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, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Revert "Revert "Added begin/rescue when trying to kill solr"" 

This reverts commit 9eb8fc55fe41727f89d9a9b0b77491521d92d36d.
Showing 1 changed file with 8 additions and 2 deletions   Show diff stats
vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
  Diff comments   View file @5005199
@@ -66,13 +66,19 @@ namespace :solr do @@ -66,13 +66,19 @@ namespace :solr do
66 require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment") 66 require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
67 fork do 67 fork do
68 if File.exists?(SOLR_PID_FILE) 68 if File.exists?(SOLR_PID_FILE)
  69 + killed = false
69 File.open(SOLR_PID_FILE, "r") do |f| 70 File.open(SOLR_PID_FILE, "r") do |f|
70 pid = f.readline 71 pid = f.readline
71 - Process.kill('TERM', pid.to_i) 72 + begin
  73 + Process.kill('TERM', pid.to_i)
  74 + killed = true
  75 + rescue
  76 + puts "Solr could not be found at pid #{pid.to_i}. Removing pid file."
  77 + end
72 end 78 end
73 File.unlink(SOLR_PID_FILE) 79 File.unlink(SOLR_PID_FILE)
74 Rake::Task["solr:destroy_index"].invoke if ENV['RAILS_ENV'] == 'test' 80 Rake::Task["solr:destroy_index"].invoke if ENV['RAILS_ENV'] == 'test'
75 - puts "Solr shutdown successfully." 81 + puts "Solr shutdown successfully." if killed
76 else 82 else
77 puts "PID file not found at #{SOLR_PID_FILE}. Either Solr is not running or no PID file was written." 83 puts "PID file not found at #{SOLR_PID_FILE}. Either Solr is not running or no PID file was written."
78 end 84 end