Merge branch 'master' into feature_new_logs

config/application.rb

@@ -9,7 +9,6 @@
 require "action_controller/railtie"
 require "rails/test_unit/railtie"
 require "active_job/logging"
-require "elasticsearch/rails/lograge"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -82,31 +81,6 @@ class Application < Rails::Application
     # secret_key_base is not used by Rails API, as there are no sessions
     config.secret_key_base = "blipblapblup"
 
-    config.lograge.enabled = true
-    config.lograge.formatter = Lograge::Formatters::Logstash.new
-    config.lograge.logger = ::LogStashLogger.new(
-      type: :stdout
-    )
-    config.lograge.log_level = ENV["LOG_LEVEL"].to_sym
-
-    config.active_job.logger = config.lograge.logger
-
-    config.lograge.ignore_actions = ["HeartbeatController#index", "IndexController#index"]
-    config.lograge.ignore_custom = lambda do |event|
-      event.payload.inspect.length > 100000
-    end
-    config.lograge.base_controller_class = "ActionController::API"
-
-    config.lograge.custom_options = lambda do |event|
-      exceptions = %w(controller action format id)
-      {
-        params: event.payload[:params].except(*exceptions),
-        uid: event.payload[:uid],
-      }
-    end
-    config.logger = config.lograge.logger
-    config.active_record.logger = nil
-
     # configure caching
     config.cache_store = :dalli_store, nil, { :namespace => ENV['APPLICATION'] }
 

config/initializers/_lograge.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "elasticsearch/rails/lograge"
+
+Rails.application.configure do
+  config.lograge.enabled = true
+  config.lograge.formatter = Lograge::Formatters::Logstash.new
+  config.lograge.logger =  LogStashLogger.new(type: :stdout)
+  config.lograge.log_level = ENV["LOG_LEVEL"].to_sym
+
+  config.active_job.logger = config.lograge.logger
+
+  config.lograge.ignore_actions = ["HeartbeatController#index", "IndexController#index"]
+  config.lograge.ignore_custom = lambda do |event|
+    event.payload.inspect.length > 100000
+  end
+  config.lograge.base_controller_class = "ActionController::API"
+
+  config.lograge.custom_options = lambda do |event|
+    exceptions = %w(controller action format id)
+    {
+      params: event.payload[:params].except(*exceptions),
+      uid: event.payload[:uid],
+    }
+  end
+end