YUKI Hiroshi
null+****@clear*****
Wed Jul 23 11:41:13 JST 2014
YUKI Hiroshi 2014-07-23 11:41:13 +0900 (Wed, 23 Jul 2014) New Revision: 3b1c524de436dbfb5e240a8da08a042c8161b5bd https://github.com/droonga/droonga-engine/commit/3b1c524de436dbfb5e240a8da08a042c8161b5bd Message: Fix order of serf options Modified files: lib/droonga/serf.rb Modified: lib/droonga/serf.rb (+7 -5) =================================================================== --- lib/droonga/serf.rb 2014-07-23 11:35:32 +0900 (d525a35) +++ lib/droonga/serf.rb 2014-07-23 11:41:13 +0900 (af763f9) @@ -109,13 +109,15 @@ module Droonga def send_event(event, payload) ensure_serf - options = ["-format", "json", event] + options_from_payload(payload) + options = ["-format", "json"] + additional_options_from_payload(payload) + options += [event, JSON.generate(payload)] run_once("event", *options) end def send_query(query, payload) ensure_serf - options = ["-format", "json", query] + options_from_payload(payload) + options = ["-format", "json"] + additional_options_from_payload(payload) + options += [query, JSON.generate(payload)] run_once("query", *options) end @@ -155,10 +157,10 @@ module Droonga process.run_once end - def options_from_payload(payload) - options = [JSON.generate(payload)] + def additional_options_from_payload(payload) + options = [] if payload.is_a?(Hash) and payload.include?("node") - options = ["-node", payload["node"]] + options + options += ["-node", payload["node"]] end options end -------------- next part -------------- HTML����������������������������...Download