grape-middleware-lograge 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0749b704c2396f878768bc0b2bc8680a2bc1680b
-  data.tar.gz: b9bdf6e794fd12569c935bb41082d8ace78f44e0
+  metadata.gz: 67d76f3667aeef4f551393982de8b570bae58e6b
+  data.tar.gz: 3e4768bba774e30e2f7269ce4edd0852b32e60f7
 SHA512:
-  metadata.gz: b23a158180609730034d9764f504caef4153c578a52e58e039f851ae6866309000ed1bfc8cd83be728f161cc67e82de2e8f26d4e0a2f7d9f08821ec867ef961b
-  data.tar.gz: 1d71a59f35cab62b41ef938891879eeb32d0570793a53823bed4091492c584ee3b86cafcbc71cf0f6b69fa87d9333dc70f640c295712302118cbae324d7b574f
+  metadata.gz: 2f13ecd79731062f3ec8a472ceb1d78f0fa4718a4994472f00dc31a894ba291e7b2dfbec053915f02b672f862f8cae38cc33ad61954dcdab536a636aba9a31f4
+  data.tar.gz: 89c747b20d031d1f3de14780dab998e4e79f185d121979bd3574d8f7c90c73e888752eaa1e0453aa5309787363194a4680fa7694f14628856b89f64aa5051ee2

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.2.1
   - 2.2.2
   - 2.2.3

data/grape-middleware-lograge.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'grape-middleware-lograge'
-  spec.version       = '1.1.0'
+  spec.version       = '1.2.0'
   spec.platform      = Gem::Platform::RUBY
   spec.authors       = ['Ryan Buckley', 'Paul Chavard']
   spec.email         = ['arebuckley@gmail.com', 'paul+github@chavard.net']

data/lib/grape/middleware/lograge.rb

@@ -1,4 +1,6 @@
 require 'grape'
+require 'lograge'
+require 'lograge/formatters/rails_logger'
 
 class Grape::Middleware::Lograge < Grape::Middleware::Globals
   BACKSLASH = '/'.freeze
@@ -9,6 +11,18 @@ class Grape::Middleware::Lograge < Grape::Middleware::Globals
 
   class << self
     attr_accessor :filter
+
+    def custom_options
+      -> (event) {
+        {
+          params:     event.payload[:params],
+          user_agent: event.payload[:user_agent],
+          request_id: event.payload[:request_id],
+          remote_ip:  event.payload[:remote_ip],
+          version:    event.payload[:version]
+        }
+      }
+    end
   end
 
   def initialize(_, options = {})
@@ -19,6 +33,13 @@ class Grape::Middleware::Lograge < Grape::Middleware::Globals
   def before
     super
 
+    @db_duration = 0
+
+    @db_subscription = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
+      event = ActiveSupport::Notifications::Event.new(*args)
+      @db_duration += event.duration
+    end if defined?(ActiveRecord)
+
     ActiveSupport::Notifications.instrument("start_processing.grape", raw_payload)
   end
 
@@ -54,12 +75,15 @@ class Grape::Middleware::Lograge < Grape::Middleware::Globals
   end
 
   def after(payload, status)
-    payload[:status]  = status
-    payload[:format]  = env['api.format']
-    payload[:version] = env['api.version']
+    payload[:status]     = status
+    payload[:format]     = env['api.format']
+    payload[:version]    = env['api.version']
+    payload[:db_runtime] = @db_duration
   end
 
   def after_exception(payload, e)
+    ActiveSupport::Notifications.unsubscribe(@db_subscription) if @db_subscription
+
     class_name = e.class.name
     status = e.respond_to?(:status) ? e.status : 500
 
@@ -70,6 +94,8 @@ class Grape::Middleware::Lograge < Grape::Middleware::Globals
   end
 
   def after_failure(payload, error)
+    ActiveSupport::Notifications.unsubscribe(@db_subscription) if @db_subscription
+
     after(payload, error[:status])
   end
 
@@ -86,7 +112,7 @@ class Grape::Middleware::Lograge < Grape::Middleware::Globals
   def raw_payload
     {
       params:     parameters.merge(
-        'action' => action_name || 'index',
+        'action' => action_name.empty? ? 'index' : action_name,
         'controller' => controller
       ),
       method:     env[Grape::Env::GRAPE_REQUEST].request_method,

data/lib/grape/middleware/lograge/railtie.rb

@@ -2,7 +2,8 @@ class Grape::Middleware::Lograge::Railtie < Rails::Railtie
   initializer 'grape.middleware.lograge', after: :load_config_initializers do
     Grape::Middleware::Lograge.filter = ActionDispatch::Http::ParameterFilter.new Rails.application.config.filter_parameters
 
-    require 'lograge'
+    Rails.application.config.lograge.custom_options = Grape::Middleware::Lograge.custom_options
+
     ::Lograge::RequestLogSubscriber.attach_to :grape
   end
 end

data/lib/lograge/formatters/rails_logger.rb

@@ -39,7 +39,15 @@ module Lograge
         if data[:error]
           "Error #{status} #{data[:error]} after #{duration}ms"
         else
-          "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{duration}ms"
+          lines = []
+          additions = []
+
+          additions << "ActiveRecord: %.1fms" % data[:db].to_f
+
+          lines << "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{duration}ms"
+          lines << " (#{additions.join(" | ")})" unless additions.blank?
+
+          lines.join("\n")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-middleware-lograge
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Buckley