grape_logging 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abce5627a8773555c3f05b4ffdc839fd051a3bf9
-  data.tar.gz: f28eb40f63b48bd004606238606486520de93223
+  metadata.gz: a1ffd8bd8e43e3c62b4ea629ff034db37f60f4e5
+  data.tar.gz: e57a2e7ee7937252d33c921ea97d8c820233889d
 SHA512:
-  metadata.gz: 0d36b9d5a70622758306bfbc26277c1b314643f1b19e7e3badac1abf098aa80f1566745aab9baf467a90345154ec0386bfacd8b162fc9e578e4177f878bf1b9a
-  data.tar.gz: e9dbc09c6c799b23e336195179940da48a9fc7ee532aa158d3c6530033b92bb5d676194f3c6a99ecb7f3de0293a3f2a2fdf4682ec312ee84ed20747a946483f3
+  metadata.gz: 79619111ac1fe3148fb631770e88da6e3b74f06447f15969194776dc7926107e3b32d1ae9feaa1c61b62e406771e9aece3c6a7d17e83d0a4c21f0d29e666318d
+  data.tar.gz: 8d3777d6d64f1450de33795f6aebaddce650afb7d5d52fc2907a1090a268a38d38ba5c826417bd252289a9fc7b35be29a685500b6d6b252a857bd31778130529

data/lib/grape_logging/formatters/lograge.rb

@@ -7,7 +7,8 @@ module GrapeLogging
           severity: severity,
           duration: time[:total],
           db: time[:db],
-          view: time[:view]
+          view: time[:view],
+          datetime: datetime.iso8601
         }.merge(data)
         ::Lograge.formatter.call(attributes) + "\n"
       end

data/lib/grape_logging/loggers/response.rb

@@ -6,14 +6,22 @@ module GrapeLogging
       end
 
       private
+
       # In some cases, response.body is not parseable by JSON.
       # For example, if you POST on a PUT endpoint, response.body is egal to """".
       # It's strange but it's the Grape behavior...
       def serialized_response_body(response)
-        begin
-          response.body.map{ |body| JSON.parse(body.to_s) }
-        rescue => e
-          response.body
+
+        if response.respond_to?(:body)
+          # Rack responses
+          begin
+            response.body.map{ |body| JSON.parse(body.to_s) }
+          rescue # No reason to have "=> e" here when we don't use it..
+            response.body
+          end
+        else
+          # Error & Exception responses
+          response
         end
       end
     end

data/lib/grape_logging/middleware/request_logger.rb

@@ -9,6 +9,10 @@ module GrapeLogging
         GrapeLogging::Timings.append_db_runtime(event)
       end if defined?(ActiveRecord)
 
+      # Persist response status & response (body)
+      # to use int in parameters
+      attr_accessor :response_status, :response_body
+
       def initialize(app, options = {})
         super
 
@@ -23,34 +27,71 @@ module GrapeLogging
       def before
         reset_db_runtime
         start_time
-
         invoke_included_loggers(:before)
       end
 
-      def after
+      def after(status, response)
         stop_time
+
+        # Response status
+        @response_status = status
+        @response_body   = response
+
+        # Perform repotters
         @reporter.perform(collect_parameters)
+
+        # Invoke loggers
         invoke_included_loggers(:after)
         nil
       end
 
+      # Call stack and parse responses & status.
+      #
+      # @note Exceptions are logged as 500 status & re-raised.
       def call!(env)
-        super
-      end
+        @env = env
 
-      protected
+        # Before hook
+        before
 
-      def response
-        begin
-          super
-        rescue
+        # Catch error
+        error = catch(:error) do
+          begin
+            @app_response = @app.call(@env)
+          rescue => e
+            # Log as 500 + message
+            after(e.respond_to?(:status) ? e.status : 500, e.message)
+
+            # Re-raise exception
+            raise e
+          end
           nil
         end
+
+        # Get status & response from app_response
+        # when no error occures.
+        if error
+          # Call with error & response
+          after(error[:status], error[:message])
+
+          # Throw again
+          throw(:error, error)
+        else
+          status, _, resp = *@app_response
+
+          # Call after hook properly
+          after(status, resp)
+        end
+
+        # Otherwise return original response
+        @app_response
       end
 
+      protected
+
       def parameters
         {
-          status: response.nil? ? 'fail' : response.status,
+          status: response_status,
           time: {
             total: total_runtime,
             db: db_runtime,
@@ -64,8 +105,9 @@ module GrapeLogging
       end
 
       private
+
       def request
-        @request ||= ::Rack::Request.new(env)
+        @request ||= ::Rack::Request.new(@env)
       end
 
       def total_runtime
@@ -95,7 +137,7 @@ module GrapeLogging
       def collect_parameters
         parameters.tap do |params|
           @included_loggers.each do |logger|
-            params.merge! logger.parameters(request, response) do |_, oldval, newval|
+            params.merge! logger.parameters(request, response_body) do |_, oldval, newval|
               oldval.respond_to?(:merge) ? oldval.merge(newval) : newval
             end
           end

data/lib/grape_logging/version.rb

@@ -1,3 +1,3 @@
 module GrapeLogging
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape_logging
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - aserafin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape