YUKI Hiroshi
null+****@clear*****
Thu Dec 26 12:44:53 JST 2013
YUKI Hiroshi 2013-12-26 12:44:53 +0900 (Thu, 26 Dec 2013) New Revision: 60b0f45472ad73891d2c21b780f3541a1e905538 https://github.com/droonga/fluent-plugin-droonga/commit/60b0f45472ad73891d2c21b780f3541a1e905538 Merged d5217b2: Merge branch 'master' of 192.168.1.21:~piro/groonga/fluent-plugin-droonga into HEAD Message: Messenger should not receive error object Modified files: lib/droonga/handler.rb lib/droonga/handler_error.rb lib/droonga/handler_messenger.rb Modified: lib/droonga/handler.rb (+1 -1) =================================================================== --- lib/droonga/handler.rb 2013-12-26 12:43:00 +0900 (944d774) +++ lib/droonga/handler.rb 2013-12-26 12:44:53 +0900 (cce9299) @@ -95,7 +95,7 @@ module Droonga begin plugin.process(command, handler_message, messenger) rescue HandlerError => error - messenger.error(error) + messenger.error(error.status_code, error.response_body) end end Modified: lib/droonga/handler_error.rb (+1 -1) =================================================================== --- lib/droonga/handler_error.rb 2013-12-26 12:43:00 +0900 (d3d9e1c) +++ lib/droonga/handler_error.rb 2013-12-26 12:44:53 +0900 (8ada301) @@ -30,7 +30,7 @@ module Droonga 500 end - def to_response_body + def response_body body = { "name" => name, "message" => @message, Modified: lib/droonga/handler_messenger.rb (+3 -3) =================================================================== --- lib/droonga/handler_messenger.rb 2013-12-26 12:43:00 +0900 (87414c7) +++ lib/droonga/handler_messenger.rb 2013-12-26 12:44:53 +0900 (c073581) @@ -51,13 +51,13 @@ module Droonga end end - def error(error) + def error(status_code, body) descendants =****@messa***** raw_message =****@messa***** if descendants.empty? return if raw_message["replyTo"].nil? - response = raw_message.merge("statusCode" => error.status_code, - "body" => error.to_response_body) + response = raw_message.merge("statusCode" => status_code, + "body" => body) @replier.reply(response) else #XXX IMPLEMENT ME!! -------------- next part -------------- HTML����������������������������...Download