process_handler 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 503d8ce446eeb4caa121a37d828f72c7662ac37d
-  data.tar.gz: fb470e66c0e819f29ccc74238ece33fe8cb4ea00
+  metadata.gz: 98fd113311c50811df459fd962cd08d07a1370ba
+  data.tar.gz: f1dc5496c0752acccb0edf3860cd4bfe0492b7f9
 SHA512:
-  metadata.gz: e509844d303791e07770096198abb40a9dae45c9de590b96ca38b96c3d896d03b52e0d426bba7ea4d3b3b542363bd91f8880d881c1272a8e22f2177d98161590
-  data.tar.gz: 7154af8b659b52b3aca64c12011dc92d7599115bcebadd769eb1fd79f9e1a9b96fc14d1014b410a30be3efb29d510950201c3b8525a45d62c133272069389bb7
+  metadata.gz: 6b063ea89548353200881c51d71f65eccb5255e5e325f9d03f7920b2a7ae842f6963c40b26c7d0fcd6e6dce598f81514ba3dbab5fc6a9ca047cde23ab219993d
+  data.tar.gz: 25dd37e89cd5656b7dc6988d519c8f933ecd6a3add4389da80051eb8aa7790cb32de6b0ac0681231ddee6e1ed8cf7b06bb86348c4a0c623ec1b758a7dd2fef8a

data/lib/salemove/process_handler/pivot_process.rb

@@ -33,6 +33,7 @@ module Salemove
                      notifier_factory: NotifierFactory,
                      process_monitor: ProcessMonitor.new,
                      process_name: 'Unknown process',
+                     log_error_as_string: false,
                      execution_time_key: DEFAULT_EXECUTION_TIME_KEY,
                      exit_enforcer: nil)
         @freddy = freddy
@@ -46,6 +47,7 @@ module Salemove
         @exception_notifier = notifier_factory.get_notifier(process_name, notifier)
         # Needed for forcing exit from jruby with exit(0)
         @exit_enforcer = exit_enforcer || Proc.new {}
+        @log_error_as_string = log_error_as_string
       end
 
       def spawn(service, blocking: true)
@@ -63,7 +65,8 @@ module Salemove
               freddy: @freddy,
               logger: @logger,
               benchmarker: @benchmarker,
-              exception_notifier: @exception_notifier
+              exception_notifier: @exception_notifier,
+              log_error_as_string: @log_error_as_string
             ).spawn
           ]
         else
@@ -131,12 +134,13 @@ module Salemove
       class ServiceSpawner
         PROCESSED_REQUEST_LOG_KEYS = [:error, :success]
 
-        def initialize(service, freddy:, logger:, benchmarker:, exception_notifier:)
+        def initialize(service, freddy:, logger:, benchmarker:, exception_notifier:, log_error_as_string:)
           @service = service
           @freddy = freddy
           @logger = logger
           @benchmarker = benchmarker
           @exception_notifier = exception_notifier
+          @log_error_as_string = log_error_as_string
         end
 
         def spawn
@@ -200,6 +204,9 @@ module Salemove
             .merge(type: input[:type])
             .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
 

data/lib/salemove/process_handler/version.rb

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

data/spec/process_handler/pivot_process_spec.rb

@@ -12,6 +12,7 @@ describe ProcessHandler::PivotProcess do
   let(:responder) { double(shutdown: true) }
   let(:logger) { Logasm.build('test-app', []) }
   let(:application) { 'my-app' }
+  let(:log_error_as_string) { false }
 
   let(:process) do
     ProcessHandler::PivotProcess.new(
@@ -20,7 +21,8 @@ describe ProcessHandler::PivotProcess do
       statsd: statsd,
       process_monitor: monitor,
       process_name: application,
-      notifier_factory: notifier_factory
+      notifier_factory: notifier_factory,
+      log_error_as_string: log_error_as_string
     )
   end
 
@@ -96,6 +98,38 @@ describe ProcessHandler::PivotProcess do
       end
     end
 
+    describe 'when service responds with an error object' do
+      let(:result) { { success: false, error: {error: 'hey', message: 'message' } } }
+
+      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", {})
+        expect(logger).to receive(:info)
+          .with(
+            "Processed request",
+            { success: false, error: {error: 'hey', message: 'message'}, type: nil }
+          )
+        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", {})
+          expect(logger).to receive(:info)
+            .with(
+              "Processed request",
+              { success: false, error: "{:error=>\"hey\", :message=>\"message\"}", type: nil }
+            )
+          subject()
+        end
+      end
+    end
+
     shared_examples 'an error_handler' do
 
       it 'logs error' do

metadata

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