Merge remote-tracking branch 'origin/master' into feature/syslog-logging-again

3 files changed, 9 insertions, 7 deletions

diff --git a/common_dependencies.rb b/common_dependencies.rb
index c795d66..6a43e26 100644
--- a/common_dependencies.rb
+++ b/common_dependencies.rb
@@ -19,3 +19,6 @@ group :test, :development do
   gem 'quiet_assets'
 end
 
+group :production do
+  gem 'SyslogLogger', '~> 2.0'
+end
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 73e98e5..32b4558 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -33,12 +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?
-    # Prepend all log lines with the following tags
-    config.log_tags = [ :leap, :webapp ]
-    config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.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