lib/timber/frameworks/rails.rb in timber-2.0.2 vs lib/timber/frameworks/rails.rb in timber-2.0.3

@@ -3,23 +3,40 @@
     module Rails
       # Installs Timber into your Rails app automatically.
       class Railtie < ::Rails::Railtie
         config.timber = Config.instance
 
-        initializer(:timber_logger, before: :initialize_logger) do
-          Rails.configure_middlewares(config.app_middleware)
-          Integrations.integrate!
-
+        initializer(:timber_silence_logger_complaints, before: :initialize_logger) do
           # We set a default logger because Rails tries to write to a file by default.
-          # This causes errors on paltforms with a readon only file system (Heroku)
+          # This causes errors on platforms with a read only file system (Heroku).
+          # See this commit: https://github.com/heroku/rails_stdout_logging/commit/13d092650118bcfeb30f383d3274cee46cbf7b8f
           # Moreover, the Timber logger gets configured properly later in an initiailizer.
           # This is a hold over until we reach that file in the initialization process.
-          logger = if defined?(::ActiveSupport::Logger)
-            ::ActiveSupport::Logger.new(STDOUT)
-          else
-            ::Logger.new(STDOUT)
+          is_heroku = !ENV['DYNO'].nil?
+          if is_heroku
+            logger = defined?(::ActiveSupport::Logger) ?
+              ::ActiveSupport::Logger.new(STDOUT) : ::Logger.new(STDOUT)
+            ::Rails.logger = config.logger = logger
           end
-          ::Rails.logger = Config.instance.logger = logger
+        end
+
+        # Initialize Timber immediately after the logger in case anything uses the logger
+        # during the initialization process.
+        initializer(:timber, after: :initialize_logger) do
+          # The goals here:
+          # 1. Respect the default log device that rails sets in :initialize_logger
+          # 2. Replace the logger with Timber::Logger so that users get our logger API
+          # 3. Disable metadata so that the logger is essentially transparent until further
+          #    configuration in initializers/timber.rb. This allows them to essentially "turn on"
+          #    timber for production, staging, etc.
+          log_device = ::Rails.logger.instance_variable_get(:@logdev).try(:dev)
+          logger = Logger.new(log_device)
+          logger.formatter = Logger::SimpleFormatter.new
+          logger.level = ::Rails.logger.level
+          ::Rails.logger = config.logger = logger
+
+          Rails.configure_middlewares(config.app_middleware)
+          Integrations.integrate!
         end
       end
 
       def self.set_logger(logger)
         if defined?(::ActiveSupport::TaggedLogging) && !logger.is_a?(::ActiveSupport::TaggedLogging)
\ No newline at end of file