Commit 4b1c5685 authored by Benjamin Neff's avatar Benjamin Neff

Merge pull request #7529 from SuperTux88/actionview-loglevel

Disable rendering logging in production
parents 138b7062 5f3a62fc
......@@ -31,6 +31,7 @@ If so, please delete it since it will prevent the federation from working proper
* Upgrade to rails 5.1 [#7514](https://github.com/diaspora/diaspora/pull/7514)
* Refactoring single post view interactions [#7182](https://github.com/diaspora/diaspora/pull/7182)
* Update help pages [#7528](https://github.com/diaspora/diaspora/pull/7528)
* Disable rendering logging in production [#7529](https://github.com/diaspora/diaspora/pull/7529)
## Bug fixes
......
......@@ -85,6 +85,7 @@ Logging::Rails.configure do |config|
Logging.logger.root.level = config.log_level
# log-levels from the diaspora.yml for SQL and federation debug-logging
Logging.logger[ActionView::Base].level = Rails.env.development? ? :debug : :warn
Logging.logger[ActiveRecord::Base].level = AppConfig.environment.logging.debug.sql? ? :debug : :info
Logging.logger[DiasporaFederation::Salmon::MagicEnvelope].level =
AppConfig.environment.logging.debug.federation? ? :debug : :info
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment