lib/kiev/logger.rb in kiev-4.6.0 vs lib/kiev/logger.rb in kiev-4.7.0

@@ -10,21 +10,23 @@
 module Kiev
   class Logger
     extend Forwardable
     def_delegators(*([:@logger] + ::Logger.instance_methods(false)))
 
-    DEFAULT_EVENT_NAME = "log"
+    DEFAULT_LOG_NAME = "log"
+    DEFAULT_MESSAGE = "log"
     LOG_ERROR = "ERROR"
     ERROR_STATUS = 500
 
-    FORMATTER = proc do |severity, time, event_name, data|
+    FORMATTER = proc do |severity, time, log_name, data|
       entry =
         {
           application: Config.instance.app,
-          event: event_name || DEFAULT_EVENT_NAME,
+          log_name: log_name || DEFAULT_LOG_NAME,
           level: severity,
           timestamp: time.utc,
+          message: log_name || DEFAULT_MESSAGE,
           tracking_id: RequestStore.store[:tracking_id],
           request_id: RequestStore.store[:request_id],
           request_depth: RequestStore.store[:request_depth],
           tree_path: RequestStore.store[:tree_path]
         }
@@ -37,16 +39,16 @@
       if RequestStore.store[:background_job]
         entry[:job_name] = RequestStore.store[:job_name]
         entry[:jid] = RequestStore.store[:jid]
       end
 
-      if !RequestStore.store[:subrequest_count] && %i(request_finished job_finished).include?(event_name)
+      if !RequestStore.store[:subrequest_count] && %i(request_finished job_finished).include?(log_name)
         entry[:tree_leaf] = true
       end
 
       if RequestStore.store[:payload]
-        if %i(request_finished job_finished).include?(event_name)
+        if %i(request_finished job_finished).include?(log_name)
           entry.merge!(RequestStore.store[:payload])
         else
           Config.instance.persistent_log_fields.each do |field|
             entry[field] = RequestStore.store[:payload][field]
           end
@@ -66,20 +68,20 @@
       entry.reject! { |_, value| value.nil? }
 
       JSON.logstash(entry)
     end
 
-    DEVELOPMENT_FORMATTER = proc do |severity, time, event_name, data|
+    DEVELOPMENT_FORMATTER = proc do |severity, time, log_name, data|
       entry = []
 
       entry << time.iso8601
-      entry << (event_name || severity).upcase
+      entry << (log_name || severity).upcase
 
       if data.is_a?(String)
         entry << "#{data}\n"
       end
 
-      if %i(request_finished job_finished).include?(event_name)
+      if %i(request_finished job_finished).include?(log_name)
         verb = RequestStore.store[:request_verb]
         path = RequestStore.store[:request_path]
         entry << "#{verb} #{path}" if verb && path
 
         job_name = RequestStore.store[:job_name]