services 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5351a6064b1da2a70dd0ce2fba47810bd7deb0f5
-  data.tar.gz: d73f3b3835195a720b4c370d15a67a017ca49a2e
+  metadata.gz: ad10bcd2778a3534fbc648b1dd2610a05037e7ce
+  data.tar.gz: 052a46223424bb49023619f47ba7a5a031ce49c4
 SHA512:
-  metadata.gz: cdeb74e291c384e338a04acf1c0036788a84bf87813ff25cae0c19b83d3157cb2b749fb09949f4f14a413fe6e90d6c1045516f86f776c176c45a52bbb147e310
-  data.tar.gz: 1ef404e5414c1fb352336b038861884404fac189dece2ce97d2261b81aee00453341e64ad85f1cb256e79e2adffcc0759ca9758de3aa2d1772877a10dd03d23c
+  metadata.gz: b8ef850720eee935e3009f2926437ae2639e8145cbde40498a616d3fcd813093f894b663b3c3956516f5cc183745fe578f07e1174b5bae7765aa2b0663fc052b
+  data.tar.gz: 1837efa6d130430ef7420b3cd4fdbeb0d9c6936b73840734adc242270aa9b336b4450bde0ceaf13f9c7d8af2121ecfc8e6c223ab0e302de6bdc8091636297aa1

data/lib/services/base.rb

@@ -17,7 +17,6 @@ module Services
 
     def initialize
       @id = SecureRandom.hex(6)
-      @logger = Logger.new
     end
 
     def call(*args)
@@ -49,10 +48,6 @@ module Services
       end
     end
 
-    def log(message, severity = :info)
-      @logger.log [self.class, @id], message, severity
-    end
-
     def controller
       @controller ||= begin
         raise 'Please configure host.' if Services.configuration.host.nil?

data/lib/services/modules/call_logger.rb

@@ -7,23 +7,34 @@ module Services
         begin
           result = super
         rescue StandardError => e
-          log "#{e.class}: #{e.message}"
-          if e.respond_to?(:cause) && !e.cause.nil?
-            log "caused by: #{e.cause.class}: #{e.cause.message}"
-            e.cause.backtrace.each do |line|
-              log line
-            end
-          else
-            e.backtrace.each do |line|
-              log line
-            end
-          end
+          log_exception e
           raise e
         ensure
           log "END after #{(Time.now - start).round(2)} seconds"
           result
         end
       end
+
+      private
+
+      def log(message, severity = :info)
+        @logger ||= Logger.new
+        @logger.log [self.class, @id], message, severity
+      end
+
+      def log_exception(e, cause = false)
+        log "#{'caused by: ' if cause}#{e.class}: #{e.message}"
+        if e.respond_to?(:cause) && !e.cause.nil?
+          e.backtrace.take(5).each do |line|
+            log "  #{line}"
+          end
+          log_exception(e.cause, true)
+        else
+          e.backtrace.each do |line|
+            log "  #{line}"
+          end
+        end
+      end
     end
   end
 end

data/lib/services/version.rb

@@ -1,3 +1,3 @@
 module Services
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/services/base_spec.rb

@@ -89,6 +89,22 @@ describe Services::Base do
     end
   end
 
+  context 'logging exceptions' do
+    if RUBY_VERSION > '2.1'
+      it 'logs the exception cause(s) as well' do
+        service = NestedExceptionService.new
+        logs = []
+        allow(service).to receive(:log) do |message, *|
+          logs << message
+        end
+        expect { service.call }.to raise_error(NestedExceptionService::Error)
+        %w(NestedError1 NestedError2).each do |error|
+          expect(logs).to include(/\Acaused by: NestedExceptionService::#{error}/)
+        end
+      end
+    end
+  end
+
   context 'when executed asynchronously' do
     it 'finds its own worker' do
       3.times { OwnWorkerService.perform_async }

data/spec/support/test_services.rb

@@ -39,3 +39,20 @@ class SiblingWorkersService < Services::Base
     sleep 0.5
   end
 end
+
+class NestedExceptionService < Services::Base
+  NestedError1 = Class.new(Error)
+  NestedError2 = Class.new(Error)
+
+  def call
+    begin
+      begin
+        raise NestedError2
+      rescue NestedError2
+        raise NestedError1
+      end
+    rescue NestedError1
+      raise Error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: services
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Manuel Meurer