From be3b2852be9788c0cfafe0576fafff391c1be0e3 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Thu, 21 May 2015 01:44:28 +0200
Subject: [PATCH] use logging-logger for sidekiq

closes #5975
---
 Changelog.md                   | 1 +
 app/workers/base.rb            | 4 ++++
 config/initializers/sidekiq.rb | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 54c1d22a6..caf3d940e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@
 * Replace foreman with eye [#5966](https://github.com/diaspora/diaspora/pull/5966)
 * Improved handling of reshares with deleted roots [#5968](https://github.com/diaspora/diaspora/pull/5968)
 * Remove two unused methods [#5970](https://github.com/diaspora/diaspora/pull/5970)
+* Refactored the Logger to add basic logrotating and more useful timestamps [#5975](https://github.com/diaspora/diaspora/pull/5975)
 
 ## Bug fixes
 * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)
diff --git a/app/workers/base.rb b/app/workers/base.rb
index 9165da7a9..7a603b8ae 100644
--- a/app/workers/base.rb
+++ b/app/workers/base.rb
@@ -8,6 +8,10 @@ module Workers
     sidekiq_options backtrace: (bt = AppConfig.environment.sidekiq.backtrace.get) && bt.to_i,
                     retry:  (rt = AppConfig.environment.sidekiq.retry.get) && rt.to_i
 
+    def logger
+      @logger ||= ::Logging::Logger[self]
+    end
+
     # In the long term we need to eliminate the cause of these
     def suppress_annoying_errors(&block)
       yield
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 529297778..dbcba8bbb 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -27,6 +27,8 @@ Sidekiq.configure_server do |config|
 
   # Make sure each Sidekiq process has its own sequence of UUIDs
   UUID.generator.next_sequence
+
+  Sidekiq.logger = Logging.logger[Sidekiq]
 end
 
 Sidekiq.configure_client do |config|