Drying up the ISO timestring with nanoseconds

paukul · Nov 15, 2010 · aafe620 · aafe620
1 parent 27e759b
commit aafe620
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/amqp_logging.rb b/lib/amqp_logging.rb
@@ -10,6 +10,11 @@
 
 module AMQPLogging
   autoload :MetricsAgent, 'amqp_logging/metrics_agent'
+
+  private
+  def self.iso_time_with_nanoseconds(t = Time.now)
+    t.strftime("%Y-%m-%dT%H:%M:%S.#{t.usec}")
+  end
 end
 
 require 'logger'

diff --git a/lib/amqp_logging/metrics_agent.rb b/lib/amqp_logging/metrics_agent.rb
@@ -44,8 +44,7 @@ def []=(fieldname, value)
     end
 
     def add_logline(severity, message, progname, logger)
-      t = Time.now
+      timestring = AMQPLogging.iso_time_with_nanoseconds
-      timestring = t.strftime("%Y-%m-%dT%H:%M:%S.#{t.usec}")
       logtype = @logger_types[logger]
       lines = @fields[:loglines][logtype]
       if !@truncated_status[logtype] && lines.size < @max_lines_per_logger

diff --git a/lib/amqp_logging/metrics_agent/rails.rb b/lib/amqp_logging/metrics_agent/rails.rb
@@ -8,8 +8,7 @@
 class ActionController::Base
   def log_processing_for_request_id_with_metrics_agent
     logger.agent[:page] = "#{self.class.name}\##{action_name}"
-    t = Time.now
+    logger.agent[:started_at] = AMQPLogging.iso_time_with_nanoseconds
-    logger.agent[:started_at] = t.strftime("%Y-%m-%dT%H:%M:%S.#{t.usec}")
     log_processing_for_request_id_without_metrics_agent
   end
   alias_method_chain :log_processing_for_request_id, :metrics_agent