Merge pull request #3 from ybart/master

Fix incompatibility with rails_stdout_logging gem
phallguy · Mar 20, 2015 · e654330 · e654330
2 parents b4d7baf + 7de04df
commit e654330
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/shog.rb b/lib/shog.rb
@@ -9,6 +9,6 @@ module Shog
   # Set up formatting options for the default rails logger.
   # @see Shog::Formatter#configure
   def self.configure(&block)
-    ::Rails.logger.formatter.configure &block
+    ::Rails.logger.formatter = Shog::Formatter.new.configure &block
   end
-end
+end
diff --git a/lib/shog/rails.rb b/lib/shog/rails.rb
@@ -6,6 +6,7 @@ module Rails
     # Automatically integrate Shog with the rails logger.
     class Railtie < ::Rails::Railtie
       config.before_initialize do
+        next if ::Rails.logger.formatter.class == Shog::Formatter
         ::Rails.logger.formatter = Shog::Formatter.new.configure do
           with :defaults
           with :requests