summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-09-23 19:56:03 +0200
committerAzul <azul@leap.se>2013-09-23 19:56:03 +0200
commit68e056061648be393dc785419fc066ec3d719e58 (patch)
tree8f0785f3950ff14dac9d605a3a29d8e8df3f19da /config
parent07a1dc526af800b68e9c1a5ccf8e0179fc417ced (diff)
Revert "default to syslog in production - #3886"
This reverts commit 073dc636ffa2da07ee7a719c6166a3ca1b593fb3. Conflicts: config/environments/production.rb
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/environments/production.rb12
2 files changed, 6 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb
index 8587ffc..e8bb2f4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -54,7 +54,7 @@ module LeapWeb
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password]
- if APP_CONFIG[:logfile].present?
+ if APP_CONFIG[:logfile]
config.logger = Logger.new(APP_CONFIG[:logfile])
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e34a4c9..32b4558 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -33,13 +33,11 @@ LeapWeb::Application.configure do
# See everything in the log (default is :info)
# config.log_level = :debug
- # Use syslog if no file has been specified
- if APP_CONFIG[:logfile].blank?
- require 'syslog/logger'
- # Prepend all log lines with the following tags
- config.log_tags = [ :leap, :webapp ]
- config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new)
- end
+ # Prepend all log lines with the following tags
+ # config.log_tags = [ :subdomain, :uuid ]
+
+ # Use a different logger for distributed setups
+ # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
# Use a different cache store in production
# config.cache_store = :mem_cache_store