Move implementation to get list of live nodes from event handler to s…

…erf wrapper
droonga · Jul 23, 2014 · efd438f · efd438f
1 parent d79b67c
commit efd438f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/lib/droonga/command/serf_event_handler.rb b/lib/droonga/command/serf_event_handler.rb
@@ -315,17 +315,7 @@ def absorb_data
       end
 
       def live_nodes
-        nodes = {}
-        raw_members = `#{@serf} members -rpc-addr #{@serf_rpc_address} -format json`
-        members = JSON.parse(raw_members)
-        members["members"].each do |member|
-          if member["status"] == "alive"
-            nodes[member["name"]] = {
-              "serfAddress" => member["addr"],
-            }
-          end
-        end
-        nodes
+        Serf.live_nodes
       end
 
       def output_live_nodes

diff --git a/lib/droonga/serf.rb b/lib/droonga/serf.rb
@@ -65,6 +65,10 @@ def send_event(name, event, payload)
       def send_query(name, query, payload)
         new(nil, name).send_query(query, payload)
       end
+
+      def live_nodes(name=nil)
+        new(nil, name).live_nodes
+      end
     end
 
     include Loggable
@@ -121,6 +125,21 @@ def send_query(query, payload)
       run_once("query", *options)
     end
 
+    def live_nodes
+      nodes = {}
+      result= run_once("members", "-format", "json")
+      members = result[:result]
+      members["members"].each do |member|
+        if member["status"] == "alive"
+          nodes[member["name"]] = {
+            "serfAddress" => member["addr"],
+            "tags"        => member["tags"],
+          }
+        end
+      end
+      nodes
+    end
+
     private
     def ensure_serf
       @serf = find_system_serf