YUKI Hiroshi
null+****@clear*****
Thu Dec 26 12:11:52 JST 2013
YUKI Hiroshi 2013-12-26 12:11:52 +0900 (Thu, 26 Dec 2013) New Revision: e3b0b57ec20d769573e93a30b03f6810b33dc1e0 https://github.com/droonga/fluent-plugin-droonga/commit/e3b0b57ec20d769573e93a30b03f6810b33dc1e0 Merged d5217b2: Merge branch 'master' of 192.168.1.21:~piro/groonga/fluent-plugin-droonga into HEAD Message: Generate response body by the error class Modified files: lib/droonga/handler_error.rb lib/droonga/handler_messenger.rb Modified: lib/droonga/handler_error.rb (+20 -2) =================================================================== --- lib/droonga/handler_error.rb 2013-12-26 12:03:13 +0900 (e7d0fd5) +++ lib/droonga/handler_error.rb 2013-12-26 12:11:52 +0900 (15dfa4b) @@ -15,11 +15,11 @@ module Droonga class HandlerError < StandardError - attr_reader :message, :detail + attr_reader :message def initialize(message, options={}) @message = message - @detial = options[:detail] || nil + self.detail = options[:detail] if options.include?(:detail) end def name @@ -29,6 +29,24 @@ module Droonga def status_code 500 end + + def detail + @detail + end + + def detail=(value) + @have_detail = true + @detail = value + end + + def to_response_body + body = { + "name" => name, + "message" => @message, + } + body["detail"] = @detail if @have_detail + body + end end class HandlerClientError < HandlerError Modified: lib/droonga/handler_messenger.rb (+1 -5) =================================================================== --- lib/droonga/handler_messenger.rb 2013-12-26 12:03:13 +0900 (cef39f9) +++ lib/droonga/handler_messenger.rb 2013-12-26 12:11:52 +0900 (87414c7) @@ -57,11 +57,7 @@ module Droonga if descendants.empty? return if raw_message["replyTo"].nil? response = raw_message.merge("statusCode" => error.status_code, - "body" => { - "name" => error.name, - "message" => error.message, - "detail" => error.detail, - }) + "body" => error.to_response_body) @replier.reply(response) else #XXX IMPLEMENT ME!! -------------- next part -------------- HTML����������������������������...Descargar
