Define error classes under the namespace "Droonga::ErrorMessage"

droonga · Feb 19, 2014 · 352e712 · 352e712
1 parent 8e863cf
commit 352e712
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/lib/droonga/catalog/base.rb b/lib/droonga/catalog/base.rb
@@ -16,7 +16,7 @@
 require "digest/sha1"
 require "zlib"
 require "time"
-require "droonga/message_processing_error"
+require "droonga/error_message"
 require "droonga/catalog/errors"
 
 module Droonga

diff --git a/lib/droonga/dispatcher.rb b/lib/droonga/dispatcher.rb
@@ -22,7 +22,7 @@
 require "droonga/farm"
 require "droonga/session"
 require "droonga/replier"
-require "droonga/message_processing_error"
+require "droonga/error_message"
 require "droonga/distributor"
 
 module Droonga
@@ -96,12 +96,12 @@ def process_message(message)
         begin
           assert_valid_message(message)
           process_input_message(message)
-        rescue MessageProcessingError => error
+        rescue ErrorMessage::Error => error
           reply("statusCode" => error.status_code,
                 "body"       => error.response_body)
         rescue StandardError, LoadError, SyntaxError => error
           Logger.error("failed to process input message", error)
-          formatted_error = MessageProcessingError.new("Unknown internal error")
+          formatted_error = ErrorMessage::InternalServerError.new("Unknown internal error")
           reply("statusCode" => formatted_error.status_code,
                 "body"       => formatted_error.response_body)
           raise error

diff --git a/lib/droonga/distributed_command_planner.rb b/lib/droonga/distributed_command_planner.rb
@@ -127,7 +127,7 @@ def unified_gatherers
     def fixed_processor
       @processor["outputs"] = @outputs
       if @processor["type"] == "scatter"
-        raise MessageProcessingError.new("missing key") unless @key
+        raise ErrorMessage::InternalServerError.new("missing key") unless @key
         @processor["key"] = @key
       end
       @processor

diff --git a/lib/droonga/message_processing_error.rb → lib/droonga/error_message.rb b/lib/droonga/message_processing_error.rb → lib/droonga/error_message.rb
@@ -17,8 +17,9 @@
 require "droonga/status_code"
 
 module Droonga
-  class MessageProcessingError < Error
-    STATUS_CODE = StatusCode::INTERNAL_SERVER_ERROR
+  module ErrorMessage
+  class Error < Droonga::Error
+    STATUS_CODE = nil
 
     attr_reader :detail
 
@@ -45,11 +46,16 @@ def response_body
     end
   end
 
-  class BadRequest < MessageProcessingError
+  class InternalServerError < Error
+    STATUS_CODE = StatusCode::INTERNAL_SERVER_ERROR
+  end
+
+  class BadRequest < Error
     STATUS_CODE = StatusCode::BAD_REQUEST
   end
 
-  class NotFound < MessageProcessingError
+  class NotFound < Error
     STATUS_CODE = StatusCode::NOT_FOUND
   end
+  end
 end
diff --git a/lib/droonga/handler_runner.rb b/lib/droonga/handler_runner.rb
@@ -96,7 +96,7 @@ def process_command(handler_class, command, raw_message)
       handler = handler_class.new(@name, @context)
       begin
         handler.handle(handler_message, messenger)
-      rescue MessageProcessingError => error
+      rescue ErrorMessage::Error => error
         messenger.error(error.status_code, error.response_body)
       end
     end

diff --git a/lib/droonga/plugins/crud.rb b/lib/droonga/plugins/crud.rb
@@ -16,7 +16,7 @@
 require "groonga"
 
 require "droonga/plugin"
-require "droonga/message_processing_error"
+require "droonga/error_message"
 
 module Droonga
   module Plugins

diff --git a/lib/droonga/plugins/error.rb b/lib/droonga/plugins/error.rb
@@ -36,7 +36,7 @@ def adapt_output(output_message)
             if status_codes.size == 1
               output_message.status_code = status_codes.first
             else
-              output_message.status_code = MessageProcessingError::STATUS_CODE
+              output_message.status_code = ErrorMessage::InternalServerError::STATUS_CODE
             end
 
             output_message.body = errors.values.first["body"]

diff --git a/lib/droonga/searcher.rb b/lib/droonga/searcher.rb
@@ -20,7 +20,7 @@
 require "groonga"
 
 require "droonga/time_formatter"
-require "droonga/message_processing_error"
+require "droonga/error_message"
 
 module Droonga
   class Searcher