process_handler 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3bc5bd2d44e7032908643187b4b5918ac8d7e06
-  data.tar.gz: 0fa7d26ad67a9cd781ae74db65b8d6361777fd85
+  metadata.gz: 81202c6d556c0fca525065d69f4861a2f3d49eb9
+  data.tar.gz: 84f98a062e9b9e87dc67dc5345a6b03f5374cd8a
 SHA512:
-  metadata.gz: 5c7b5f5b6f8853720286082e7652372756cd37a94bccab771602d1a40512d23fd0dae6be44e5cdd200c8e54691d6d6b3cdbed7c6e6bf889a59063653750ec25b
-  data.tar.gz: 0d3825b18eff31cc1383461627dd4d86e77207ad5f9ba0f85aeedba6b0c84f741138c030093decfc0aa255d21a2bf50cb27ae099fed68df9efce9d5b29d5c599
+  metadata.gz: b5f5c704431e9fab040bb0a0e84f96cfd0202608b8e3226c4f31e6dd034e4533544d2545e8a30047d1dd07837e38205b3d0985f5a2899df21de5f64b86837b6f
+  data.tar.gz: 989bfbb942d69afaf31a8944dfd04874941a8f5d3438429de528f76d5908efeac97c742e1fe96e4f0dc3ed8e9bb4836fe0cb2dcd0259e69f8220d309c99b494d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    process_handler (0.1.5)
+    process_handler (0.2.0)
       airbrake
       growl
       sucker_punch (~> 1.1)

data/lib/salemove/process_handler/pivot_process.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'benchmark'
+require 'securerandom'
 require_relative 'process_monitor'
 require_relative 'notifier_factory'
 
@@ -67,8 +68,9 @@ module Salemove
 
         bm = Benchmark.measure { result = block.call }
         if defined?(Logasm) && PivotProcess.logger.is_a?(Logasm)
-          PivotProcess.logger.debug "Execution time",
-            type: type, real: bm.real, user: bm.utime, system: bm.stime
+          PivotProcess.logger.info "Execution time",
+            request_id: input[:request_id], type: type,
+            real: bm.real, user: bm.utime, system: bm.stime
         end
         result
       end
@@ -92,18 +94,20 @@ module Salemove
 
         def spawn(queue)
           @messenger.tap_into(queue) do |input|
-            delegate_to_service(input.merge(type: queue))
+            request_id = SecureRandom.hex(5)
+            delegate_to_service(input.merge(type: queue, request_id: request_id))
           end
         end
 
         def delegate_to_service(input)
+          PivotProcess.logger.info "Received request", input
           PivotProcess.benchmark(input) { @service.call(input) }
         rescue => exception
           handle_exception(exception, input)
         end
 
         def handle_exception(e, input)
-          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"))
+          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"), request_id: input[:request_id])
           if @exception_notifier
             @exception_notifier.notify_or_ignore(e, cgi_data: ENV.to_hash, parameters: input)
           end
@@ -123,7 +127,9 @@ module Salemove
 
         def spawn
           @messenger.respond_to(@service.class::QUEUE) do |input, handler|
-            response = handle_request(input)
+            request_id = SecureRandom.hex(5)
+
+            response = handle_request(input.merge(request_id: request_id))
             if response.respond_to?(:fulfilled?)
               handle_fulfillable_response(handler, response)
             else
@@ -165,13 +171,14 @@ module Salemove
         end
 
         def delegate_to_service(input)
+          request_id = input[:request_id]
           result = PivotProcess.benchmark(input) { @service.call(input) }
-          PivotProcess.logger.info "Result: #{result.inspect}"
+          PivotProcess.logger.info "Processed request", result.merge(request_id: request_id)
           result
         end
 
         def handle_exception(e, input)
-          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"))
+          PivotProcess.logger.error(e.inspect + "\n" + e.backtrace.join("\n"), request_id: input[:request_id])
           if @exception_notifier
             @exception_notifier.notify_or_ignore(e, cgi_data: ENV.to_hash, parameters: input)
           end

data/lib/salemove/process_handler/version.rb

@@ -1,5 +1,5 @@
 module Salemove
   module ProcessHandler
-    VERSION = '0.1.5'
+    VERSION = '0.2.0'
   end
 end

data/spec/process_handler/pivot_process_spec.rb

@@ -25,7 +25,6 @@ describe ProcessHandler::PivotProcess do
     expect_monitor_to_behave
   end
 
-
   describe 'responding services' do
     class ResultService
       QUEUE = 'Dummy'
@@ -44,7 +43,6 @@ describe ProcessHandler::PivotProcess do
       expect(responder).to receive(:join)
     end
 
-
     def expect_message
       expect(messenger).to receive(:respond_to) {|destination, &callback|
         callback.call(input, handler)
@@ -54,14 +52,14 @@ describe ProcessHandler::PivotProcess do
     before do
       expect_message
       expect_handler_thread_to_behave
-      allow(service).to receive(:call).with(input) { result }
+      allow(service).to receive(:call).with(input.merge(request_id: anything)) { result }
     end
 
     describe 'when service responds correctly' do
 
       it 'can be executed with logger' do
         expect(handler).to receive(:success).with(result)
-        expect(service).to receive(:call).with(input)
+        expect(service).to receive(:call).with(input.merge(request_id: anything))
         subject()
       end
 
@@ -71,7 +69,7 @@ describe ProcessHandler::PivotProcess do
       let(:result) { { success: false, error: 'hey' } }
 
       before do
-        expect(service).to receive(:call).with(input) { result }
+        expect(service).to receive(:call).with(input.merge(request_id: anything)) { result }
       end
 
       it 'acks the message properly' do
@@ -109,7 +107,7 @@ describe ProcessHandler::PivotProcess do
       let(:exception) { "what an unexpected exception!" }
 
       before do
-        expect(service).to receive(:call).with(input) { raise exception }
+        expect(service).to receive(:call).with(input.merge(request_id: anything)) { raise exception }
       end
 
       it 'acks the message properly' do
@@ -121,25 +119,8 @@ describe ProcessHandler::PivotProcess do
 
     end
 
-    describe 'when exception raises after service call' do
-
-      let(:result) { { success: false, output: exception } }
-      let(:exception) { "no no no ... no inspect for you!" }
-
-      before do
-        expect(result).to receive(:inspect) { raise exception }
-      end
-
-      it 'still acks the message properly' do
-        subject()
-      end
-
-      it_behaves_like 'an error_handler'
-
-    end
-
     describe 'when result is fulfillable' do
-      let(:result) { double }
+      let(:result) { {} }
 
       context 'and its already fulfilled' do
         let(:value) { { success: true, output: { result: 'R'} } }
@@ -216,11 +197,10 @@ describe ProcessHandler::PivotProcess do
       allow(service).to receive(:call).with(input)
     end
 
-
     describe 'when service handles the input correctly' do
       it 'can be executed' do
-        expect(service).to receive(:call).with(input.merge(type: 'one'))
-        expect(service).to receive(:call).with(input.merge(type: 'two'))
+        expect(service).to receive(:call).with(input.merge(type: 'one', request_id: anything))
+        expect(service).to receive(:call).with(input.merge(type: 'two', request_id: anything))
         subject()
       end
     end
@@ -251,8 +231,8 @@ describe ProcessHandler::PivotProcess do
       let(:exception) { "what an unexpected exception!" }
 
       before do
-        expect(service).to receive(:call).with(input.merge(type: 'one')) {}
-        expect(service).to receive(:call).with(input.merge(type: 'two')) { raise exception }
+        expect(service).to receive(:call).with(input.merge(type: 'one', request_id: anything)) {}
+        expect(service).to receive(:call).with(input.merge(type: 'two', request_id: anything)) { raise exception }
       end
 
       it_behaves_like 'an error_handler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Indrek Juhkam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ''