unified_logger 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f997be3565304602e61861f9555d78a550590c2d9b16c03a5f46e59e4bdb7425
-  data.tar.gz: 29a54437d74ead254614b32db980f4d82899b3c485a658c23a3033f53b6d93e7
+  metadata.gz: f34d66cc38e92a52e408550171eee1d6ceae0986add635943f295647ddcdb514
+  data.tar.gz: 33b16e4caff961adee468add42c01d4a40b304285bd669470510b6b749c3ba44
 SHA512:
-  metadata.gz: c3517a18d9d4d0be7bbd3e44dafd499dd14283fdd9405bc73efdcf7650f806e6985cfb0024bc80d09cf2c3e5ffc106c91ee228ec0d1bcebf950ac25c624ee9ae
-  data.tar.gz: 6c9f0b095284b4d350d6f97ddbd49744a8667086834685f90414cf8c0089cb0723ae573b319580bd08f22f78404949995378216dcad1dc176bcfcb2c0ac15f31
+  metadata.gz: ec774f89b414ea15af8bf6f1c0493aaeff2ea1f41364ff9bf16913a7c468d5f7ce1baf8fffea17f6880ff514082d68e1c80483f14af949ad8df84e3547035525
+  data.tar.gz: c956c43f2eeca0cc91f9438cab02a579445f07e64952f0bc54157a237e5600e0d921e0e03a2de72ee05a8ff12655c89cdc645127d19e687137bf52ea6e0a286a

data/lib/unified_logger/job_logger.rb

@@ -16,6 +16,7 @@ module UnifiedLogger
       def log_execution(job)
         log = {
           log_type:             :job,
+          timestamp:            UnifiedLogger.formatted_time,
           class_name:           job.class.name,
           id:                   job.job_id,
           queue:                job.queue_name,

data/lib/unified_logger/logger.rb

@@ -17,32 +17,38 @@ module UnifiedLogger
       self.formatter = proc {}
     end
 
-    def debug(message = nil, params = {})
-      add(::Logger::DEBUG, message, params)
+    def debug(message = nil, &block)
+      message = block.call if message.nil? && block
+      add(::Logger::DEBUG, message)
     end
 
-    def info(message = nil, params = {})
-      add(::Logger::INFO, message, params)
+    def info(message = nil, &block)
+      message = block.call if message.nil? && block
+      add(::Logger::INFO, message)
     end
 
-    def warn(message = nil, params = {})
-      add(::Logger::WARN, message, params)
+    def warn(message = nil, &block)
+      message = block.call if message.nil? && block
+      add(::Logger::WARN, message)
     end
 
-    def error(message = nil, params = {})
-      add(::Logger::ERROR, message, params)
+    def error(message = nil, &block)
+      message = block.call if message.nil? && block
+      add(::Logger::ERROR, message)
     end
 
-    def fatal(message = nil, params = {})
-      add(::Logger::FATAL, message, params)
+    def fatal(message = nil, &block)
+      message = block.call if message.nil? && block
+      add(::Logger::FATAL, message)
     end
 
-    def unknown(message = nil, params = {})
-      add(::Logger::UNKNOWN, message, params)
+    def unknown(message = nil, &block)
+      message = block.call if message.nil? && block
+      add(::Logger::UNKNOWN, message)
     end
 
     def <<(message)
-      add(::Logger::UNKNOWN, message.to_s.chomp, {})
+      add(::Logger::UNKNOWN, message.to_s.chomp)
       self
     end
 
@@ -117,20 +123,23 @@ module UnifiedLogger
       end
     end
 
-    private
+    def add(severity, message = nil, progname = nil, &block)
+      if message.nil?
+        message = block ? block.call : progname
+      end
 
-    def add(severity, message = nil, params = {})
       return true if message.blank?
       return true unless severity >= level
 
       severity_symbol = SEVERITY_MAP[severity] || :unknown
-      append_custom_log(severity_symbol, message, params)
+      append_custom_log(severity_symbol, message)
     end
 
-    def append_custom_log(severity, message, params)
-      clean_message = sanitize_log_message(message)
-      log_hash = { timestamp: UnifiedLogger.current_time, severity: severity,
-                   message: clean_message, params: params }.reject { |_, v| v.respond_to?(:empty?) ? v.empty? : !v }
+    private
+
+    def append_custom_log(severity, message)
+      message = sanitize_log_message(message) if message.is_a?(String)
+      log_hash = { timestamp: UnifiedLogger.formatted_time, severity: severity, message: message }
 
       CUSTOM_LOGS.value = CUSTOM_LOGS.value + [log_hash]
     end

data/lib/unified_logger/request_logger.rb

@@ -37,6 +37,7 @@ module UnifiedLogger
       query_string = env["QUERY_STRING"]
       log = {
         log_type:   :request,
+        timestamp:  UnifiedLogger.formatted_time,
         id:         env["action_dispatch.request_id"],
         ip:         env["action_dispatch.remote_ip"].to_s,
         controller: path_parameters[:controller],

data/lib/unified_logger/version.rb

@@ -1,3 +1,3 @@
 module UnifiedLogger
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/unified_logger.rb

@@ -79,6 +79,10 @@ module UnifiedLogger
   def self.current_time
     Time.zone&.now || Time.now.utc
   end
+
+  def self.formatted_time
+    current_time.iso8601(3)
+  end
 end
 
 require "unified_logger/railtie" if defined?(Rails::Railtie)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unified_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marcovecchio