Merged r14155 (#19405).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14205 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/application.rb b/config/application.rb
index 906b06785f617d0e98fd52cdc574b707f353bd5f..0f75247c1e780ca43fe2179b76d8f69ac6af4eed 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -59,6 +59,10 @@ module RedmineApp
     # for more options (same options as config.cache_store).
     config.redmine_search_cache_store = :memory_store
 
+    # Configure log level here so that additional environment file
+    # can change it (environments/ENV.rb would take precedence over it)
+    config.log_level = Rails.env.production? ? :info : :debug
+
     config.session_store :cookie_store, :key => '_redmine_session'
 
     if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 59e7a37576c7b67a9609b8fe5913950570d953e6..85cd3890cfa5f9a0c652498dab3d16831974771b 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,8 +1,6 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  config.log_level = :info
-
   # Code is not reloaded between requests.
   config.cache_classes = true