From a0a0fdd1b5ea82140108959e370205dc9e1aac7b Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete.matsy@gmail.com>
Date: Fri, 16 Aug 2024 16:11:13 +0300
Subject: [PATCH] clean log

---
 config/environments/production.rb | 64 +++++++++++++------------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 319a9bc6..aa655b6c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -126,42 +126,32 @@ Rails.application.configure do
   config.lograge.enabled = true
   config.lograge.base_controller_class = ['ActionController::API', 'ActionController::Base']
 
-  if ENV['MULTITENANT'] == 'true'
-    config.lograge.formatter = ->(data) { data.except(:path, :location).to_json }
-
-    config.lograge.custom_payload do |controller|
-      params =
-        begin
-          controller.request.try(:params) || {}
-        rescue StandardError
-          {}
-        end
-
-      {
-        fwd: controller.request.remote_ip,
-        params: {
-          id: params[:id],
-          template_id: params[:template_id],
-          submission_id: params[:submission_id],
-          submitter_id: params[:submitter_id],
-          sig: (params[:signed_uuid] || params[:signed_id]).to_s.split('--').first,
-          slug: (params[:slug] ||
-                 params[:submitter_slug] ||
-                 params[:submission_slug] ||
-                 params[:submit_form_slug] ||
-                 params[:template_slug]).to_s.last(5)
-        }.compact_blank,
-        host: controller.request.host,
-        uid: controller.instance_variable_get(:@current_user).try(:id)
-      }
-    end
-  else
-    config.lograge.formatter = Lograge::Formatters::Json.new
-
-    config.lograge.custom_payload do |controller|
-      {
-        fwd: controller.request.remote_ip
-      }
-    end
+  config.lograge.formatter = ->(data) { data.except(:path, :location).to_json }
+
+  config.lograge.custom_payload do |controller|
+    params =
+      begin
+        controller.request.try(:params) || {}
+      rescue StandardError
+        {}
+      end
+
+    {
+      fwd: controller.request.remote_ip,
+      params: {
+        id: params[:id],
+        template_id: params[:template_id],
+        submission_id: params[:submission_id],
+        submitter_id: params[:submitter_id],
+        sig: (params[:signed_uuid] || params[:signed_id]).to_s.split('--').first,
+        slug: (params[:slug] ||
+               params[:submitter_slug] ||
+               params[:submission_slug] ||
+               params[:submit_form_slug] ||
+               params[:template_slug]).to_s.first(5)
+      }.compact_blank,
+      host: controller.request.host,
+      uid: controller.instance_variable_get(:@current_user).try(:id)
+    }
   end
 end