Skip to content

Commit

Permalink
Don't set key for logfile on Heroku
Browse files Browse the repository at this point in the history
This fixes the issue reported in diaspora#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 diaspora#6500
  • Loading branch information
lstoll authored and jhass committed Oct 14, 2015
1 parent 70b5d86 commit 6ac6dc1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion config/sidekiq.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 6ac6dc1

Please sign in to comment.