Commit 6ac6dc10 authored Oct 13, 2015 by Lincoln Stoll Committed by Jonne Haß Oct 14, 2015

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

parent 70b5d863

Changelog.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

config/sidekiq.yml

+3 −1

Original line number	Diff line number	Diff line
		<% 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