Download as
Browse Code »

Commit 9eb8fc55fe41727f89d9a9b0b77491521d92d36d

Authored by Daniela Feitosa
1 parent 4ea10045
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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

This reverts commit 4e61bfb7a04ef3a7171343867aca05c4ce401197.

There are some problems with solr
(ActionItem1958)
Showing 1 changed file with 2 additions and 8 deletions   Show diff stats
vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
  Diff comments   View file @9eb8fc5
@@ -66,19 +66,13 @@ namespace :solr do @@ -66,19 +66,13 @@ 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  
70 File.open(SOLR_PID_FILE, "r") do |f| 69 File.open(SOLR_PID_FILE, "r") do |f|
71 pid = f.readline 70 pid = f.readline
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 71 + Process.kill('TERM', pid.to_i)
78 end 72 end
79 File.unlink(SOLR_PID_FILE) 73 File.unlink(SOLR_PID_FILE)
80 Rake::Task["solr:destroy_index"].invoke if ENV['RAILS_ENV'] == 'test' 74 Rake::Task["solr:destroy_index"].invoke if ENV['RAILS_ENV'] == 'test'
81 - puts "Solr shutdown successfully." if killed 75 + puts "Solr shutdown successfully."
82 else 76 else
83 puts "PID file not found at #{SOLR_PID_FILE}. Either Solr is not running or no PID file was written." 77 puts "PID file not found at #{SOLR_PID_FILE}. Either Solr is not running or no PID file was written."
84 end 78 end