chore: refactor

chatwoot · sojan-official · Apr 7, 2023 · Sep 12, 2022 · Sep 12, 2022 · Sep 14, 2022
commit 6ec24bf1317f7d8a4d5b09aa48af447d8913997a
diff --git a/.env.example b/.env.example
@@ -110,6 +110,8 @@ AWS_REGION=
 RAILS_LOG_TO_STDOUT=true
 LOG_LEVEL=info
 LOG_SIZE=500
+# Configure this environment variable if you want to use lograge instead of rails logger
+#LOGRAGE_ENABLED=true
 
 ### This environment variables are only required if you are setting up social media channels
 

diff --git a/Gemfile b/Gemfile
@@ -149,7 +149,8 @@ gem 'net-imap', require: false
 gem 'net-pop', require: false
 gem 'net-smtp', require: false
 
-gem 'lograge', '~> 0.12.0'
+# Include logrange conditionally in intializer using env variable
+gem 'lograge', '~> 0.12.0',  require: false
 
 # worked with microsoft refresh token
 gem 'omniauth-oauth2'

diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
@@ -1,24 +1,28 @@
-Rails.application.configure do
-  config.lograge.enabled = true
-  config.lograge.keep_original_rails_log = true
-  config.lograge.formatter = Lograge::Formatters::Json.new
-  config.colorize_logging = false
-  config.lograge.custom_payload do |controller|
-    {
-      host: controller.request.host,
-      remote_ip: controller.request.remote_ip,
-      user_id: controller.current_user.try(:id)
-    }
-  end
+if ActiveModel::Type::Boolean.new.cast(ENV.fetch('LOGRAGE_ENABLED', false)).present?
+  require 'lograge'
 
-  config.lograge.custom_options = lambda do |event|
-    {
-      level: event.payload[:level]
-    }
-  end
+  Rails.application.configure do
+    config.lograge.enabled = true
+    config.lograge.formatter = Lograge::Formatters::Json.new
+
+    config.lograge.custom_payload do |controller|
+      {
+        host: controller.request.host,
+        remote_ip: controller.request.remote_ip,
+        user_id: controller.current_user.try(:id)
+      }
+    end
+
+    config.lograge.custom_options = lambda do |event|
+      param_exceptions = %w[controller action format id]
+      {
+        params: event.payload[:params]&.except(*param_exceptions)
+      }
+    end
 
-  config.lograge.ignore_custom = lambda do |event|
-    # ignore update_presence  events in log
-    return true if event.payload[:channel_class] == 'RoomChannel'
+    config.lograge.ignore_custom = lambda do |event|
+      # ignore update_presence  events in log
+      return true if event.payload[:channel_class] == 'RoomChannel'
+    end
   end
 end