diff options
| author | Azul <azul@leap.se> | 2013-09-20 14:22:28 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-09-20 14:22:28 +0200 |
| commit | 985406273233905868c70918bafd767d8870c76a (patch) | |
| tree | 2b1ab7c9e89f2aaae379938430f40e5b3babfbbf /config | |
| parent | 13e91941396a74b6245dcb9d81b9cfa77861df95 (diff) | |
| parent | 890c9e170fc038eccb46eca3c1ddcf6f05eaa53f (diff) | |
Merge tag '0.2.3'
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 11 | ||||
| -rw-r--r-- | config/initializers/session_store.rb | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb index e8bb2f4..8587ffc 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] + if APP_CONFIG[:logfile].present? config.logger = Logger.new(APP_CONFIG[:logfile]) end diff --git a/config/environments/production.rb b/config/environments/production.rb index 32b4558..73e98e5 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -33,11 +33,12 @@ LeapWeb::Application.configure do # See everything in the log (default is :info) # config.log_level = :debug - # 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 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 # Use a different cache store in production # config.cache_store = :mem_cache_store diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index b454120..8b63e5b 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,8 +1,9 @@ # Be sure to restart your server when you modify this file. -LeapWeb::Application.config.session_store CouchRestSessionStore +LeapWeb::Application.config.session_store CouchRest::Session::Store, + expire_after: 1800 -CouchRestSessionStore.configure do |conf| +CouchRest::Session::Store.configure do |conf| conf.environment = Rails.env conf.connection_config_file = File.join(Rails.root, 'config', 'couchdb.yml') conf.connection[:prefix] = |