appfuel-service 0.2.11 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cd12824170706dbce596a3e5cdb94a3bd0f3996
-  data.tar.gz: 07fd6d61b72382a28561d56f6c84a90446d84a7b
+  metadata.gz: 49f4ecb203ac98c01c7d7420023858517050c19b
+  data.tar.gz: 6dbc6d6f64d48174cc1da516652f3e866e6f2619
 SHA512:
-  metadata.gz: b9df1660285c042835c7b22d01e0269d8d00eb20f7553a638d6e8fea03db8af78f6a50dce0628061e66cb64f633eb805a2a601e3248145aac2e08d3d7e09cdc5
-  data.tar.gz: b0a32d7aaa27da86c5c31709bb2bf627ea3ef167f5b946ccf2063fd3cdc40c556c06d0274886f8b5a8d43029c21b7a74fe9f00c970ff60b2ef6a44f2980e7537
+  metadata.gz: 54faddafcf35f32c5df83012ab099907ea706201952fb55bd3a0ce561f78ccd9e03fd4e7a3a11cc6c4bbceafd7c3066bc839da0e5b1208ea10bc67ccd64ece1a
+  data.tar.gz: 02be1f89fd3ef210d00cc2efd041e053ef7e3b6611e9b7471bcc291b98a9edc597363c8be4c9b4c12859246069b6777897ec24dfa4a191da55487a62548b184b

data/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
+## [[0.3.2]](https://github.com/rsb/appfuel/releases/tag/0.3.2) 2017-09-19
+### Fixed
+- worker did not log handled failures
+
+## [[0.3.1]](https://github.com/rsb/appfuel/releases/tag/0.3.1) 2017-09-18
+### Changed
+- adding error handling/logging for rpc and non rpc requests
+
 ## [[0.3.0]](https://github.com/rsb/appfuel/releases/tag/0.2.11) 2017-09-15
 ### Changed
 - update sneakers to `2.6`

data/lib/appfuel/service/config/sneakers.rb

@@ -34,6 +34,7 @@ module Appfuel
                   workers: 1,
                   threads: 1,
                   prefetch: 1,
+                  retry_timeout: 60 * 1000, # 60s
                   timeout_job_after: 5,
                   durable: true
 

data/lib/appfuel/service/initializers/message_broker.rb

@@ -10,6 +10,7 @@ Appfuel::Initialize.define('global.message_broker') do |config, container|
 
   require 'sneakers'
   require 'sneakers/runner'
+  require 'sneakers/handlers/maxretry'
 
   Sneakers.configure(config[:sneakers])
 

data/lib/appfuel/service/msg_request.rb

@@ -16,7 +16,7 @@ module Appfuel
       # @return MsgRequest
       def initialize(msg, delivery_info, properties)
         inputs = validate_inputs(msg)
-        action_route    = properties.headers['action_route']
+        action_route    = properties.headers['action_route'].to_s
         @properties     = properties
         @delivery_info  = delivery_info
 
@@ -40,8 +40,11 @@ module Appfuel
         properties.correlation_id
       end
 
-      private
+      def action_route?
+        !action_route.empty?
+      end
 
+      private
       def validate_inputs(msg)
         msg = msg.to_s
         return {} if msg.empty?

data/lib/appfuel/service/version.rb

@@ -1,5 +1,5 @@
 module Appfuel
   module Service
-    VERSION = "0.2.11"
+    VERSION = "0.3.2"
   end
 end

data/lib/appfuel/service/worker.rb

@@ -1,3 +1,4 @@
+require 'sneakers/handlers/maxretry'
 module Appfuel
   module Service
     class Worker
@@ -34,31 +35,27 @@ module Appfuel
       # @param properties [Bunny::MessageProperties]
       # @return [Appfuel::Response]
       def work_with_params(msg, delivery_info, properties)
-        container = app_container
-        logger    = container[:logger]
-        logger.info "[queue worker] accepting msg"
         begin
-          request = create_request(msg, delivery_info, properties)
+          request  = create_request(msg, delivery_info, properties)
         rescue => e
-          error_msg = "[queue worker] failed to create request " + e.message
-          logger.error error_msg
-          if properties.correlation_id && properties.reply_to
-            request  = create_request('{}', delivery_info, properties)
-            response = Appfuel::ResponseHandler.new.error(worker: [error_msg])
-            publish_rpc(request, response)
-          end
+          request = create_request('{}', delivery_info, properties)
+          handle_exception("failed to build request", e, request)
+          return ack!
+        end
 
-          return reject!
+        begin
+          response = dispatch(request, app_container)
+        rescue => e
+          handle_exception("failed to dispatch", e, request)
+          return ack!
         end
 
-        response  = dispatch(request, container)
         if response.failure?
-          logger = container[:logger]
-          logger.error response.error_messages
+          msg_line = response.error_messages.join(' ')
+          logger.error "[#{request.action_route}] #{msg_line}"
         end
 
-        if request.rpc?
-          logger.info "[queue worker] returning rpc msg"
+        if rpc?(properties)
           publish_rpc(request, response)
         end
 
@@ -66,6 +63,10 @@ module Appfuel
       end
 
 
+      def rpc?(properties)
+        properties.correlation_id && properties.reply_to
+      end
+
       # Publish a response for the rpc request.
       #
       # @param request [MsgRequest]
@@ -81,8 +82,25 @@ module Appfuel
         nil
       end
 
+      def logger
+        @logger ||= app_container[:logger]
+      end
+
       private
 
+      def handle_exception(label, e, request)
+        err_msg = "[queue #{queue}] #{label}: #{e.message}"
+        logger.error err_msg
+        if rpc?(request.properties)
+          response = create_error_response(queue, error_msg)
+          publish_rpc(request, response)
+        end
+      end
+
+      def create_error_response(key, err_msg)
+        Appfuel::ResponseHandler.new.error(key => [error_msg])
+      end
+
       def create_request(msg, delivery_info, properties)
         Appfuel::Service::MsgRequest.new(msg, delivery_info, properties)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel-service
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.2
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appfuel