logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe git clone https://hacktivis.me/git/mastofe.git
commit: 49bbef1202f483d4e8abc43d00d12551bb25f80f
parent 8f800ad6917e5fb41d17098f3f860d0d1aedcabe
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 10 Apr 2018 16:08:28 +0200

Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)

Fix #3565 (oops)

Diffstat:

Mconfig/initializers/sidekiq.rb6++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true -namespace = ENV.fetch('REDIS_NAMESPACE') { nil } +namespace = ENV.fetch('REDIS_NAMESPACE') { nil } redis_params = { url: ENV['REDIS_URL'] } if namespace - redis_params [:namespace] = namespace + redis_params[:namespace] = namespace end Sidekiq.configure_server do |config| @@ -18,3 +18,5 @@ end Sidekiq.configure_client do |config| config.redis = redis_params end + +Sidekiq::Logging.logger.level = ::Logger::const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)