]> cat aescling's git repositories - mastodon.git/commitdiff
Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 10 Apr 2018 14:08:28 +0000 (16:08 +0200)
committerGitHub <noreply@github.com>
Tue, 10 Apr 2018 14:08:28 +0000 (16:08 +0200)
Fix #3565 (oops)

config/initializers/sidekiq.rb

index f875fbd951afba2b221fa3cf8f40998f3e7ebaf1..05c804100564f491e9f45bd6a98e747b0ec6a7b6 100644 (file)
@@ -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)