lograge-sql 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11cea1c366c76e19619e78e5d957f863cefa1fd5ec55a2330242cde0a92adc42
-  data.tar.gz: 343afe00dbf0ef4755400c9c234c12cf60806572a723f825c75e36a9e78ecbb2
+  metadata.gz: 3726273a2b54f66be4bbdab30b8b2166d9d45f00d2e27b7e0f217aab51befe14
+  data.tar.gz: b35279e56a149def5f8ac6db9d564bc27e264971b15bfe064d63e87a8398ce26
 SHA512:
-  metadata.gz: af84fccad7b7f4f98e44b4dfbf7fe95c73adefd0e09c552d6a5b3857564b674b8d0a177d28c37f9a03d34348a467cd9ddbadd343f4954fd91f68a2870ba7d079
-  data.tar.gz: 47b359c21d2549d575b4f8eb672927da8ac1baaa4a719e738d7ce735a72503bc41da6260502fec8b8e540d75380af78f7c23cbc570ecfc8239882255675ea4d9
+  metadata.gz: 7d171a9e1a9f2152cc4e3d22434334849f3df4aca8131fb625967ecd79d390a3cb555ce14f6839023221dee85415be8c5068c46492b602d22cd28f69a4fe1309
+  data.tar.gz: dd425accb219b4342a58a1a7275ba032c11e3d8caa04b6342ca7db8a8ddf8ec3552097cca95d4e4d3a6b0c8c9240b519dfb3ab6285a3b2ebfeaf14147c816fed

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Exclude:
     - gemfiles/vendor/bundle/**/*
 

data/README.md

@@ -23,6 +23,12 @@ In order to enable SQL logging in your application, you'll simply need to add th
 require 'lograge/sql/extension'
 ```
 
+By default, Lograge::Sql disables default logging on ActiveRecord. To preserve default logging, add this to your lograge initializer:
+
+```ruby
+config.lograge_sql.keep_default_active_record_log = true
+```
+
 ## Customization
 
 By default, the format is a string concatenation of the query name, the query duration and the query itself joined by `\n` newline:

data/lib/lograge/sql.rb

@@ -15,6 +15,13 @@ module Lograge
       def setup(config)
         Lograge::Sql.formatter     = config.formatter     || default_formatter
         Lograge::Sql.extract_event = config.extract_event || default_extract_event
+
+        return if config.keep_default_active_record_log
+
+        # Disable existing ActiveRecord logging
+        ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
+          Lograge.unsubscribe(:active_record, subscriber) if subscriber.is_a?(ActiveRecord::LogSubscriber)
+        end
       end
 
       def store

data/lib/lograge/sql/extension.rb

@@ -45,8 +45,4 @@ else
   Lograge::LogSubscribers::ActionController.prepend Lograge::Sql::Extension
 end
 
-ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
-  Lograge.unsubscribe(:active_record, subscriber) if subscriber.is_a?(ActiveRecord::LogSubscriber)
-end
-
 Lograge::ActiveRecordLogSubscriber.attach_to :active_record

data/lib/lograge/sql/version.rb

@@ -3,6 +3,6 @@
 module Lograge
   module Sql
     # Gem version
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lograge-sql
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mattia Giuffrida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord