lib/imprint/tracer.rb in imprint-1.4.3.pre2 vs lib/imprint/tracer.rb in imprint-1.4.3.pre3

@@ -3,15 +3,14 @@
     TRACER_HEADER    = 'HTTP_IMPRINTID'
     TRACER_KEY       = 'IMPRINTID'
     RAILS_REQUEST_ID = "action_dispatch.request_id"
     TRACE_ID_DEFAULT = "-1"
     TRACER_TIMESTAMP = "TIMESTAMP"
-    
-    TRACE_CHARS = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
+    TRACE_CHARS      = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
 
     def self.set_trace_id(id, rack_env = {})
-      Thread.current[TRACER_TIMESTAMP] ||= Time.now.strftime("%Y-%m-%dT%H:%M:%S.%6N")
+      get_trace_timestamp
       Thread.current[TRACER_KEY] = id
       # setting to the rack_env, gives error tracking support in some systems
       rack_env[TRACER_KEY] = id
     end
 
@@ -21,25 +20,26 @@
       else
         TRACE_ID_DEFAULT
       end
     end
 
-    def	self.get_trace_timestamp
-      Thread.current[TRACER_TIMESTAMP] ||= Time.now.strftime("%Y-%m-%dT%H:%M:%S.%6N")
+    def self.get_trace_timestamp
+      Thread.current[TRACER_TIMESTAMP] ||= Time.now.strftime("%Y-%m-%dT%H:%M:%S.%6N") + " ##{$$}"
     end
 
-    def self.insert_trace_id_in_message(message)
+    def self.insert_trace_id_in_message(message, severity = nil)
       if message && message.is_a?(String) && message.length > 1 && !message.include?('trace_id=')
         trace_id = get_trace_id
 
         if trace_id && trace_id != TRACE_ID_DEFAULT
-      	  message.insert 0, "[#{get_trace_timestamp}] "
+          message.insert 0, "[#{get_trace_timestamp}] #{severity} -- : "
           message.gsub!("\n"," trace_id=#{trace_id}\n")
         end
       end
     end
 
     def self.rand_trace_id
       (0...6).map { TRACE_CHARS[rand(TRACE_CHARS.length)] }.join
     end
   end
 end
+