YUKI Hiroshi
null+****@clear*****
Fri Jul 18 10:23:38 JST 2014
YUKI Hiroshi 2014-07-18 10:23:38 +0900 (Fri, 18 Jul 2014) New Revision: 8c235b2a10022256da93f838fae5f9980dcf01c7 https://github.com/droonga/droonga-engine/commit/8c235b2a10022256da93f838fae5f9980dcf01c7 Message: Use utility method to run remote command in command line tools Modified files: bin/droonga-engine-absorb-data bin/droonga-engine-unjoin Modified: bin/droonga-engine-absorb-data (+13 -8) =================================================================== --- bin/droonga-engine-absorb-data 2014-07-18 10:21:20 +0900 (78b95f9) +++ bin/droonga-engine-absorb-data 2014-07-18 10:23:38 +0900 (2a1f4f4) @@ -70,15 +70,20 @@ end destination_node = "#{options.destination_host}:#{options.port}/#{options.tag}" +def run_remote_command(target, command, options) + result = Droonga::Serf.send_query(target, command, options) + puts result[:result] + puts result[:error] unless result[:error].empty? +end + + puts "Absorbing data..." -result = Droonga::Serf.send_query(destination_node, "absorb_data", - "node" => destination_node, - "source" => options.source_host, - "port" => options.port, - "tag" => options.tag, - "dataset" => options.dataset) -puts result[:result] -puts result[:error] unless result[:error].empty? +run_remote_command(destination_node, "absorb_data", + "node" => destination_node, + "source" => options.source_host, + "port" => options.port, + "tag" => options.tag, + "dataset" => options.dataset) puts "Done." exit(true) Modified: bin/droonga-engine-unjoin (+10 -5) =================================================================== --- bin/droonga-engine-unjoin 2014-07-18 10:21:20 +0900 (9ee4c2e) +++ bin/droonga-engine-unjoin 2014-07-18 10:23:38 +0900 (c70d75e) @@ -79,13 +79,18 @@ remaining_host = options.other_hosts.first || options.replica_remove_host options.remaining_node = "#{remaining_host}:#{options.port}/#{options.tag}" +def run_remote_command(target, command, options) + result = Droonga::Serf.send_query(target, command, options) + puts result[:result] + puts result[:error] unless result[:error].empty? +end + + puts "Unjoining replica from the cluster..." -result = Droonga::Serf.send_query(options.remaining_node, "remove_replicas", - "dataset" => options.dataset, - "hosts" => [options.replica_remove_host]) -puts result[:result] -puts result[:error] unless result[:error].empty? +run_remote_command(options.remaining_node, "remove_replicas", + "dataset" => options.dataset, + "hosts" => [options.replica_remove_host]) puts "Done." -------------- next part -------------- HTML����������������������������...下載
