gorg_service 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23984c4b8e4322a1423a2d6458c7025303da38b7
-  data.tar.gz: 6c3e2e694dc143d926742bab066b31448808b4b5
+  metadata.gz: c1a373eae1c1f417da46ab05ed254a6282f8db2c
+  data.tar.gz: b67c38dcea30bac3b29d3857db22794f190f7b00
 SHA512:
-  metadata.gz: 268e2a10c35eec58d78d6a177d05d53a648ff62e955323419649673fbfa18c99de4dd2705793bc2d18ad8169d1ba83cab2d0f5d7c7d3b583bcd210a91016ef09
-  data.tar.gz: dff239c0d3c80884cf6f8adf47b54c97160ed801c870ea5dffec578dd7dda07fc449a159a1f2a4a36f5d059370de1d7ab3d534090470f6997b41cf9598c6c60e
+  metadata.gz: ac47bf636d8e2cabf1d8dfcdff4344460df2f9e6b8f533dff63bd122b91ac4d87d822dbdcd8e74cb29889352703481fcc4a1f6e20602af3b7ef6563ef4128e17
+  data.tar.gz: 097c3a1bebe68f1ddf315e09b1461a8d2fa677e4b09936146a4413d25ae8e893ffa5a627ac2f84daef00d02c74fd1eef1efda48d35677116be392b3d333278f6

data/bin/worker

@@ -14,4 +14,4 @@ require "gorg_service"
 env_path=File.expand_path("./env.rb",File.dirname(__FILE__)) 
 require env_path if File.file?(env_path)
 
-GorgService.new.run
+GorgService::Consumer.new.run

data/lib/gorg_service/consumer/message_handler/base.rb

@@ -8,12 +8,15 @@ class GorgService
         def initialize(message)
           @message=message
 
-          begin
-            validate
-          rescue GorgService::Message::DataValidationError => e
-            raise_hardfail("DataValidationError",error: e.errors)
+          GorgService::Consumer::MessageHandler::ExceptionManager.instance.with_exception_rescuing(self.message) do
+            begin
+              validate
+            rescue GorgService::Message::DataValidationError => e
+              raise_hardfail("DataValidationError",error: e.errors)
+            end
+
+            process
           end
-          process
         end
 
         def validate
@@ -30,14 +33,25 @@ class GorgService
         alias_method :msg, :message
 
         def raise_hardfail(message, error: nil)
-          raise HardfailError.new(message, error)
+          self.class.raise_hardfail(message, error: error)
         end
 
         def raise_softfail(message, error: nil)
-          raise SoftfailError.new(message, error)
+          self.class.raise_softfail(message, error: error)
         end
 
         class << self
+          def raise_hardfail(message, error: nil)
+            raise HardfailError.new(message, error)
+          end
+
+          def raise_softfail(message, error: nil)
+            raise SoftfailError.new(message, error)
+          end
+
+          def handle_error(*errorClasses,&block)
+            GorgService::Consumer::MessageHandler::ExceptionManager.instance.set_rescue_from(*errorClasses,&block)
+          end
 
           def listen_to(routing_key)
             MessageRouter.register_route(routing_key, self)

data/lib/gorg_service/consumer/message_handler/exception_manager.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+class GorgService
+  class Consumer
+    module MessageHandler
+      class ExceptionManager
+
+        def self.instance
+          @instance ||= self.new
+        end
+
+        def with_exception_rescuing(message=nil)
+          begin
+            begin
+              yield
+            rescue *rescuable_exceptions => e
+              get_rescue_block_for(e).call(e,message)
+            end
+          rescue GorgService::Consumer::FailError => e
+            raise e
+          # rescue StandardError => e
+          #   GorgService.logger.error "Uncaught exception : #{e.inspect}"
+          #   raise HardfailError.new("UncaughtException", e)
+          end
+        end
+
+        def set_rescue_from(*exception_classes,&block)
+          exception_classes.each do |e|
+            exceptions_hash[e]=block
+          end
+        end
+
+        def rescuable_exceptions
+          exceptions_hash.keys
+        end
+
+        def get_rescue_block_for(exception)
+          exceptions_hash.find{|k,_v| exception.is_a?(k)}[1]
+        end
+
+        private
+
+        def exceptions_hash
+          @exceptions_hash ||= Hash.new
+        end
+
+      end
+    end
+  end
+end

data/lib/gorg_service/consumer/message_handler.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+require "gorg_service/consumer/message_handler/exception_manager"
+
 class GorgService
   class Consumer
     module MessageHandler
@@ -12,4 +14,4 @@ end
 require "gorg_service/consumer/message_handler/base"
 require "gorg_service/consumer/message_handler/event_handler"
 require "gorg_service/consumer/message_handler/request_handler"
-require "gorg_service/consumer/message_handler/reply_handler"
+require "gorg_service/consumer/message_handler/reply_handler"

data/lib/gorg_service/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 class GorgService
-  VERSION = "5.0.0"
+  VERSION = "5.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gorg_service
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Alexandre Narbonne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -169,6 +169,7 @@ files:
 - lib/gorg_service/consumer/message_handler.rb
 - lib/gorg_service/consumer/message_handler/base.rb
 - lib/gorg_service/consumer/message_handler/event_handler.rb
+- lib/gorg_service/consumer/message_handler/exception_manager.rb
 - lib/gorg_service/consumer/message_handler/reply_handler.rb
 - lib/gorg_service/consumer/message_handler/request_handler.rb
 - lib/gorg_service/consumer/message_router.rb