lib/ezlog/railtie.rb in ezlog-0.2.2 vs lib/ezlog/railtie.rb in ezlog-0.3.1

@@ -1,23 +1,36 @@
 module Ezlog
   class Railtie < Rails::Railtie
     initializer 'ezlog.configure_logging' do |app|
       ::Logging.logger.root.appenders = ::Logging.appenders.stdout 'stdout',
-                                                                   layout: Ezlog::LoggingLayout.new(environment: Rails.env),
-                                                                   level: app.config.log_level || :info
+                                                                   layout: Ezlog::LoggingLayout.new(environment: ::Rails.env),
+                                                                   level: app.config.log_level
     end
 
     initializer 'ezlog.configure_sidekiq_logging' do
       initialize_sidekiq_logging if defined? ::Sidekiq
     end
 
     initializer 'ezlog.configure_rack_timeout_logging' do
-      initialize_rack_timeout_logging if defined? ::Rack::Timeout
+      disable_rack_timeout_logging if defined? ::Rack::Timeout
     end
 
+    initializer 'ezlog.configure_middlewares' do |app|
+      app.config.middleware.insert_after ::ActionDispatch::RequestId, Ezlog::Rails::RequestLogContext
+      app.config.middleware.swap ::Rails::Rack::Logger, Ezlog::Rails::AccessLog, Ezlog.logger('AccessLog')
+      app.config.middleware.swap ::ActionDispatch::DebugExceptions, Ezlog::Rails::DebugExceptions
+      app.config.middleware.insert_after Ezlog::Rails::DebugExceptions, Ezlog::Rails::LogExceptions, Ezlog.logger('Application')
+    end
+
+    config.after_initialize do
+      Ezlog::Rails::LogSubscriber.detach ::ActionController::LogSubscriber
+      Ezlog::Rails::LogSubscriber.detach ::ActionView::LogSubscriber
+    end
+
     config.before_configuration do |app|
-      app.config.logger = ::Logging.logger['Application']
+      app.config.logger = Ezlog.logger('Application')
+      app.config.log_level = :info
     end
 
     private
 
     def initialize_sidekiq_logging
@@ -28,11 +41,10 @@
         config.error_handlers << Ezlog::Sidekiq::ErrorLogger.new
         config.error_handlers.delete_if { |handler| handler.is_a? ::Sidekiq::ExceptionHandler::Logger }
       end
     end
 
-    def initialize_rack_timeout_logging
-      ::Rack::Timeout::Logger.logger = ::Logging.logger['rack-timeout']
-      ::Rack::Timeout::Logger.logger.level = :warn
+    def disable_rack_timeout_logging
+      ::Rack::Timeout::Logger.logger = ::Logger.new(nil)
     end
   end
 end