summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/application.rb4
-rw-r--r--config/environments/production.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb
index 906b06785..0f75247c1 100644
--- 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 59e7a3757..85cd3890c 100644
--- 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