YUKI Hiroshi
null+****@clear*****
Thu May 8 16:24:44 JST 2014
YUKI Hiroshi 2014-05-08 16:24:44 +0900 (Thu, 08 May 2014) New Revision: 6c943bc4c72638cfff2af45ee3efd2e6a0f29410 https://github.com/droonga/droonga-engine/commit/6c943bc4c72638cfff2af45ee3efd2e6a0f29410 Message: Generate and update list of live nodes correctly Modified files: lib/droonga/serf_event_handler.rb Modified: lib/droonga/serf_event_handler.rb (+5 -10) =================================================================== --- lib/droonga/serf_event_handler.rb 2014-05-08 16:22:37 +0900 (aa2440d) +++ lib/droonga/serf_event_handler.rb 2014-05-08 16:24:44 +0900 (45b4dae) @@ -25,12 +25,12 @@ module Droonga end end - attr_writer :live_nodes - def run(command_line_arguments) parse_command_line_arguments!(command_line_arguments) parse_event + @live_nodes = load_live_nodes(@list_file) + update_live_nodes output_live_nodes 0 @@ -40,10 +40,6 @@ module Droonga @changed_nodes ||= parse_changed_nodes(@payload) end - def live_nodes - @live_nodes ||= load_live_nodes(@list_file) - end - private def parse_command_line_arguments!(command_line_arguments) parser = OptionParser.new @@ -95,18 +91,17 @@ module Droonga def update_live_nodes case @event_name when "member-join" - nodes = live_nodes - live_nodes = nodes.merge(changed_nodes) + @live_nodes = @live_nodes.merge(changed_nodes) when "member-leave", "member-failed" changed_nodes.each do |name, attributes| - live_nodes.delete(name) + @live_nodes.delete(name) end # when "user:XXX", "query:XXX" end end def output_live_nodes - list_file_contents = JSON.pretty_generate(live_nodes) + list_file_contents = JSON.pretty_generate(@live_nodes) if @list_file @list_file.write(list_file_contents) else -------------- next part -------------- HTML����������������������������...Download
