process_handler 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fd113311c50811df459fd962cd08d07a1370ba
-  data.tar.gz: f1dc5496c0752acccb0edf3860cd4bfe0492b7f9
+  metadata.gz: 18bd46cb222d715eb1f2d0000fabc2729e10f572
+  data.tar.gz: 48142bddc135aff00600a45cf5953fa011d2f637
 SHA512:
-  metadata.gz: 6b063ea89548353200881c51d71f65eccb5255e5e325f9d03f7920b2a7ae842f6963c40b26c7d0fcd6e6dce598f81514ba3dbab5fc6a9ca047cde23ab219993d
-  data.tar.gz: 25dd37e89cd5656b7dc6988d519c8f933ecd6a3add4389da80051eb8aa7790cb32de6b0ac0681231ddee6e1ed8cf7b06bb86348c4a0c623ec1b758a7dd2fef8a
+  metadata.gz: 2f70fec6cbc732807c28be56a8a76730dd5a009033314162ceec96a4d3c32844365db9b301e88d66bbef41f874c20025de3ed8b6375a29612bcc152669972335
+  data.tar.gz: 3e22860d47e46de9d1d69e0f890580fae564c6890d9410129576b992efe30de6b5348e04e1aa7f2d67ee2f5372d6e328acdabffaf6f8f6a267bac625e83f032a

data/lib/salemove/process_handler/pivot_process.rb

@@ -119,14 +119,22 @@ module Salemove
         def delegate_to_service(input)
           @logger.info 'Received request', PivotProcess.trace_information.merge(input)
           @benchmarker.call(input) { @service.call(input) }
-        rescue => exception
+        rescue StandardError => exception
           handle_exception(exception, input)
         end
 
-        def handle_exception(e, input)
-          @logger.error(e.inspect + "\n" + e.backtrace.join("\n"), PivotProcess.trace_information)
+        def handle_exception(exception, input)
+          message = [exception.inspect, *exception.backtrace].join("\n")
+          metadata = PivotProcess.trace_information.merge(input)
+
+          @logger.error(message, metadata)
+
           if @exception_notifier
-            @exception_notifier.notify_or_ignore(e, cgi_data: ENV.to_hash, parameters: input)
+            @exception_notifier.notify_or_ignore(
+              exception,
+              cgi_data: ENV.to_hash,
+              parameters: input
+            )
           end
         end
       end
@@ -185,13 +193,14 @@ module Salemove
           else
             delegate_to_service(input)
           end
-        rescue => exception
+        rescue StandardError => exception
           handle_exception(exception, input)
         end
 
         def delegate_to_service(input)
           result = @benchmarker.call(input) { @service.call(input) }
-          if !result.respond_to?(:fulfilled?)
+
+          unless result.respond_to?(:fulfilled?)
             log_processed_request(input, result)
           end
 
@@ -200,22 +209,32 @@ module Salemove
 
         def log_processed_request(input, result)
           attributes = result
-            .select {|k, _| PROCESSED_REQUEST_LOG_KEYS.include?(k)}
-            .merge(type: input[:type])
+            .select { |k, _| PROCESSED_REQUEST_LOG_KEYS.include?(k) }
+            .merge(input)
             .merge(PivotProcess.trace_information)
 
           if @log_error_as_string
             attributes[:error] = attributes[:error].to_s if attributes.has_key?(:error)
           end
+
           @logger.info 'Processed request', attributes
         end
 
-        def handle_exception(e, input)
-          @logger.error(e.inspect + "\n" + e.backtrace.join("\n"), PivotProcess.trace_information)
+        def handle_exception(exception, input)
+          message = [exception.inspect, *exception.backtrace].join("\n")
+          metadata = PivotProcess.trace_information.merge(input)
+
+          @logger.error(message, metadata)
+
           if @exception_notifier
-            @exception_notifier.notify_or_ignore(e, cgi_data: ENV.to_hash, parameters: input)
+            @exception_notifier.notify_or_ignore(
+              exception,
+              cgi_data: ENV.to_hash,
+              parameters: input
+            )
           end
-          { success: false, error: e.message }
+
+          { success: false, error: exception.message }
         end
       end
 

data/lib/salemove/process_handler/version.rb

@@ -1,5 +1,5 @@
 module Salemove
   module ProcessHandler
-    VERSION = '2.1.0'
+    VERSION = '2.2.0'
   end
 end

data/spec/process_handler/pivot_process_spec.rb

@@ -99,46 +99,55 @@ describe ProcessHandler::PivotProcess do
     end
 
     describe 'when service responds with an error object' do
-      let(:result) { { success: false, error: {error: 'hey', message: 'message' } } }
+      let(:result) { { success: false, error: { error: 'hey', message: 'message' } } }
+      let(:input) { { type: :update, value: 42 } }
 
       before do
         expect(service).to receive(:call).with(input) { result }
       end
 
-      it 'logs the message as an object' do
-        expect(logger).to receive(:info).with("Received request", {})
+      it 'logs the message as an object and includes input' do
+        expect(logger).to receive(:info).with('Received request', input)
+
         expect(logger).to receive(:info)
           .with(
-            "Processed request",
-            { success: false, error: {error: 'hey', message: 'message'}, type: nil }
+            'Processed request',
+            {
+              success: false,
+              error: { error: 'hey', message: 'message' }
+            }.merge(input)
           )
-        subject()
+
+        subject
       end
 
       describe 'when log_error_as_string' do
         let(:log_error_as_string) { true }
 
-        it 'logs the message as string' do
-          expect(logger).to receive(:info).with("Received request", {})
+        it 'logs the message as string and includes input' do
+          expect(logger).to receive(:info).with('Received request', input)
+
           expect(logger).to receive(:info)
             .with(
-              "Processed request",
-              { success: false, error: "{:error=>\"hey\", :message=>\"message\"}", type: nil }
+              'Processed request',
+              {
+                success: false,
+                error: '{:error=>"hey", :message=>"message"}'
+              }.merge(input)
             )
-          subject()
+
+          subject
         end
       end
     end
 
     shared_examples 'an error_handler' do
-
       it 'logs error' do
-        expect(logger).to receive(:error)
-        subject()
+        expect(logger).to receive(:error).with(an_instance_of(String), input)
+        subject
       end
 
       describe 'with exception_notifier' do
-
         let(:exception_notifier) { double('Airbrake') }
 
         before do
@@ -147,16 +156,15 @@ describe ProcessHandler::PivotProcess do
 
         it 'triggers exception_notifier' do
           expect(exception_notifier).to receive(:notify_or_ignore)
-          subject()
+          subject
         end
       end
-
     end
 
     describe 'when service raises exception' do
-
+      let(:input) { { type: :update, value: 42 } }
       let(:result) { { success: false, error: exception } }
-      let(:exception) { "what an unexpected exception!" }
+      let(:exception) { 'what an unexpected exception!' }
 
       before do
         expect(service).to receive(:call).with(input) { raise exception }
@@ -164,11 +172,10 @@ describe ProcessHandler::PivotProcess do
 
       it 'acks the message properly' do
         expect(handler).to receive(:error).with(result)
-        subject()
+        subject
       end
 
       it_behaves_like 'an error_handler'
-
     end
 
     describe 'when result is fulfillable' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_handler
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - SaleMove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake