DRY up things further in LogCursor::Logger

ee/lib/gitlab/geo/log_cursor/daemon.rb

@@ -303,11 +303,13 @@ module Gitlab
 
         def logger
           strong_memoize(:logger) do
-            level = options[:debug] ? :debug : Rails.logger.level
-
-            Gitlab::Geo::LogCursor::Logger.new(self.class, level)
+            Gitlab::Geo::LogCursor::Logger.new(self.class, log_level)
           end
         end
+
+        def log_level
+          options[:debug] ? :debug : Rails.logger.level
+        end
       end
     end
   end

ee/lib/gitlab/geo/log_cursor/logger.rb

@@ -6,29 +6,27 @@ module Gitlab
 
         PID = Process.pid.freeze
 
-        def initialize(klass, level = Rails.logger.level)
+        def initialize(klass, level = nil)
           @klass = klass
-          geo_logger.build.level = level
+          geo_logger.build.level = level unless level.nil?
         end
 
         def event_info(created_at, message, params = {})
-          args = base_log_data(message).merge(
-            cursor_delay_s: cursor_delay(created_at)
-          ).merge(params)
+          params = params.merge(cursor_delay_s: cursor_delay(created_at))
 
-          geo_logger.info(args)
+          info(message, params)
         end
 
         def info(message, params = {})
-          geo_logger.info(base_log_data(message).merge(params))
+          geo_logger.info(base_log_data(message, params))
         end
 
         def error(message, params = {})
-          geo_logger.error(base_log_data(message).merge(params))
+          geo_logger.error(base_log_data(message, params))
         end
 
         def debug(message, params = {})
-          geo_logger.debug(base_log_data(message).merge(params))
+          geo_logger.debug(base_log_data(message, params))
         end
 
         private
@@ -45,12 +43,12 @@ module Gitlab
           (Time.now - created_at).to_f.round(3)
         end
 
-        def base_log_data(message)
+        def base_log_data(message, params = {})
           {
             pid: PID,
             class: caller_name,
             message: message
-          }
+          }.merge(params)
         end
       end
     end