From 607e63cb252f05c66892163eb21481086d0238f9 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Wed, 10 Jun 2015 10:09:48 -0700
Subject: [PATCH] Dont log timestamp on Heroku, fixes #2343

---
 Changes.md             | 1 +
 lib/sidekiq/logging.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index 757921f0e..aa8c3545e 100644
--- a/Changes.md
+++ b/Changes.md
@@ -4,6 +4,7 @@ HEAD
 - Set a `created_at` attribute when jobs are created, set `enqueued_at` only
   when they go into a queue. Fixes invalid latency calculations with scheduled jobs.
   [#2373, mrsimo]
+- Don't log timestamp on Heroku [#2343]
 
 3.3.4
 -----------
diff --git a/lib/sidekiq/logging.rb b/lib/sidekiq/logging.rb
index b5863c5f6..fa18ffda9 100644
--- a/lib/sidekiq/logging.rb
+++ b/lib/sidekiq/logging.rb
@@ -18,6 +18,12 @@ def context
       end
     end
 
+    class WithoutTimestamp < Pretty
+      def call(severity, time, program_name, message)
+        "#{::Process.pid} TID-#{Thread.current.object_id.to_s(36)}#{context} #{severity}: #{message}\n"
+      end
+    end
+
     def self.with_context(msg)
       Thread.current[:sidekiq_context] ||= []
       Thread.current[:sidekiq_context] << msg
@@ -30,7 +36,7 @@ def self.initialize_logger(log_target = STDOUT)
       oldlogger = defined?(@logger) ? @logger : nil
       @logger = Logger.new(log_target)
       @logger.level = Logger::INFO
-      @logger.formatter = Pretty.new
+      @logger.formatter = ENV['DYNO'] ? WithoutTimestamp.new : Pretty.new
       oldlogger.close if oldlogger && !$TESTING # don't want to close testing's STDOUT logging
       @logger
     end