From 6ac6dc1059758efe0ae07c9e68cff0d4f064206b Mon Sep 17 00:00:00 2001
From: Lincoln Stoll <lincoln.stoll@gmail.com>
Date: Tue, 13 Oct 2015 22:36:55 -0400
Subject: [PATCH] Don't set key for logfile on Heroku

This fixes the issue reported in #5947. Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.

closes #6500
---
 Changelog.md       | 1 +
 config/sidekiq.yml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ce5ce969ea..56d83be432 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@
 
 ## Bug fixes
 * Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496)
+* Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
 
 ## Features
 
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 5ea3d5fa10..50d7a8b5cf 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,7 +1,9 @@
 <% require_relative 'config/load_config' %>
 ---
 :verbose: false
-:logfile: "<%= AppConfig.sidekiq_log unless AppConfig.heroku? %>"
+<% unless AppConfig.heroku? %>
+:logfile: "<%= AppConfig.sidekiq_log %>"
+<% end %>
 :concurrency: <%= AppConfig.environment.sidekiq.concurrency.to_i %>
 :queues:
   - socket_webfinger
-- 
GitLab