lib/lumberjack/log_entry.rb in lumberjack-1.0.13 vs lib/lumberjack/log_entry.rb in lumberjack-1.1.0

@@ -2,37 +2,62 @@
 
 module Lumberjack
   # An entry in a log is a data structure that captures the log message as well as
   # information about the system that logged the message.
   class LogEntry
-    attr_accessor :time, :message, :severity, :progname, :pid, :unit_of_work_id
-    
-    TIME_FORMAT = "%Y-%m-%dT%H:%M:%S".freeze
-    
-    def initialize(time, severity, message, progname, pid, unit_of_work_id)
+    attr_accessor :time, :message, :severity, :progname, :pid, :tags
+
+    TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
+
+    UNIT_OF_WORK_ID = "unit_of_work_id"
+
+    def initialize(time, severity, message, progname, pid, tags)
       @time = time
       @severity = (severity.is_a?(Integer) ? severity : Severity.label_to_level(severity))
       @message = message
       @progname = progname
       @pid = pid
-      @unit_of_work_id = unit_of_work_id
+      # backward compatibility with 1.0 API where the last argument was the unit of work id
+      if tags.nil? || tags.is_a?(Hash)
+        @tags = tags
+      else
+        @tags = { UNIT_OF_WORK_ID => tags }
+      end
     end
-    
+
     def severity_label
       Severity.level_to_label(severity)
     end
-    
+
     def to_s
-      buf = "[#{time.strftime(TIME_FORMAT)}.#{(time.usec / 1000.0).round.to_s.rjust(3, '0')} #{severity_label} #{progname}(#{pid})"
-      if unit_of_work_id
-        buf << " #"
-        buf << unit_of_work_id
-      end
-      buf << "] "
-      buf << message
+      "[#{time.strftime(TIME_FORMAT)}.#{(time.usec / 1000.0).round.to_s.rjust(3, '0')} #{severity_label} #{progname}(#{pid})#{tags_to_s}] #{message}"
     end
-    
+
     def inspect
       to_s
+    end
+
+    # Deprecated - backward compatibility with 1.0 API
+    def unit_of_work_id
+      tags[UNIT_OF_WORK_ID] if tags
+    end
+
+    # Deprecated - backward compatibility with 1.0 API
+    def unit_of_work_id=(value)
+      if tags
+        tags[UNIT_OF_WORK_ID] = value
+      else
+        @tags = { UNIT_OF_WORK_ID => value }
+      end
+    end
+
+    private
+
+    def tags_to_s
+      tags_string = String.new
+      if tags
+        tags.each { |name, value| tags_string << " #{name}:#{value.inspect}" }
+      end
+      tags_string
     end
   end
 end