gorg_service 5.2.2 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e601580576a13d24bfc6344518bf4164ab6b56b
-  data.tar.gz: b8a11b10276dfb2012c08bc039fb4c8523f8e3f5
+  metadata.gz: d3d9c3c871e5a6935dee0f07d3f2468230693db0
+  data.tar.gz: bd8271abd2ac9085e6876a01954dd2fe275c0d5d
 SHA512:
-  metadata.gz: 394545a8032cce75bae1470d88d653ec56841bc33debaf196521b04501934b6d16cb5de2ec350498b02a84ebd7877bda13aa7c5e3c64c8d522602ed4e566de53
-  data.tar.gz: c8cd51a3345a1c890648d88b3123ebc0cbf2055acc94c992825e8e55c233cf6a8bd572a3758316f808f20eb7e1d39030fee48693eea290dab2aee0727beecf92
+  metadata.gz: a7bb3a4ac509a723f3da50736b6b18e3b4b0e68ebccbf64340da9de27520cc24b2d6f113c04a4f1023cd785e715bcc7dd8b0ba4a122b47bd75a46ab4e122ecf6
+  data.tar.gz: 35e3c66558ca64821b972f60a7de9f184068d39a1e7b189a500f07b75af9ce1a38857feda896629d9ebd56cc9f41f4c335d9dd8f6fbb31309cf660377e2e4ccb

data/lib/gorg_service/consumer/listener.rb

@@ -43,19 +43,14 @@ class GorgService
       def process_message(delivery_info, _properties, body)
         message=nil
         begin
-          begin
-            #Parse message
-            message=Message.parse(delivery_info, _properties, body)
-
-            #Process message
-            incomming_message_error_count=message.errors.count
-            MessageRouter.new(message)
-            process_logging(message) if message.errors.count>incomming_message_error_count
-          rescue SoftfailError, HardfailError
-            raise
-          rescue  StandardError => e
-            raise HardfailError.new("UnrescuedException", e)
-          end
+          #Parse message
+          message=Message.parse(delivery_info, _properties, body)
+
+          #Process message
+          incomming_message_error_count=message.errors.count
+          MessageRouter.new(message)
+          process_logging(message) if message.errors.count>incomming_message_error_count
+
         rescue SoftfailError => e
           process_softfail(e, message)
         rescue HardfailError => e

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

@@ -32,21 +32,57 @@ class GorgService
         end
         alias_method :msg, :message
 
-        def raise_hardfail(message, error: nil)
-          self.class.raise_hardfail(message, error: error)
+        def reply_with(data)
+          self.class.reply_to(message, data)
         end
 
-        def raise_softfail(message, error: nil)
-          self.class.raise_softfail(message, error: error)
+        def raise_hardfail(error_message, error: nil, data: nil)
+          self.class.raise_hardfail(error_message, error: error, message:message, data:data)
+        end
+
+        def raise_softfail(error_message, error: nil, data: nil)
+          self.class.raise_softfail(error_message, error: error, message:message, data:data)
         end
 
         class << self
-          def raise_hardfail(message, error: nil)
-            raise HardfailError.new(message, error)
+
+          def reply_to(message,data)
+            if message.expect_reply?
+
+              reply=GorgService::Message.new(
+                  event: message.reply_routing_key,
+                  data: data,
+                  correlation_id: message.id,
+                  type: "reply"
+              )
+
+              replier=GorgService::Producer.new
+              replier.publish_message(reply,exchange: message.reply_to)
+            end
           end
 
-          def raise_softfail(message, error: nil)
-            raise SoftfailError.new(message, error)
+          def raise_hardfail(error_message,message:nil, error: nil, data: nil)
+            if message
+              reply_to(message,{
+                  status: 'hardfail',
+                  error_message: error_message,
+                  debug_message: error&&error.inspect,
+                  error_data: data
+              })
+            end
+            raise HardfailError.new(error_message, error)
+          end
+
+          def raise_softfail(error_message,message:nil, error: nil, data: nil)
+            if message
+              reply_to(message,{
+                  status: 'softfail',
+                  error_message: error_message,
+                  debug_message: error&&error.inspect,
+                  error_data: data
+              })
+            end
+            raise SoftfailError.new(error_message, error)
           end
 
           def handle_error(*errorClasses,&block)

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

@@ -6,42 +6,6 @@ class GorgService
     module MessageHandler
       class RequestHandler < Base
 
-        def reply_with(data)
-          if message.expect_reply?
-
-            reply=GorgService::Message.new(
-              event: message.reply_routing_key,
-              data: data,
-              correlation_id: message.id,
-              type: "reply"
-            )
-
-            replier=GorgService::Producer.new
-            replier.publish_message(reply,exchange: message.reply_to)
-          end
-        end
-
-        def raise_hardfail(message, error: nil, data: nil)
-          reply_with({
-                         status: 'hardfail',
-                         error_message: message,
-                         debug_message: error&&error.inspect,
-                         error_data: data
-                     })
-
-          super(message, error: error)
-        end
-
-        def raise_softfail(message, error: nil, data: nil)
-          reply_with({
-                         status: 'softfail',
-                         error_message: message,
-                         debug_message: error&&error.inspect,
-                         error_data: data
-                     })
-          super(message, error: error)
-        end
-
       end
     end
   end

data/lib/gorg_service/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gorg_service
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.3.0
 platform: ruby
 authors:
 - Alexandre Narbonne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny