Don't double up newlines in the log

[rails.git] / config / initializers / session_store.rb

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 92e4150459f885daf93522e73b8474a472260dba..a9afad2d644d2433c813c488af2fa60ee36c6027 100644 (file)
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-OpenStreetMap::Application.config.session_store :cookie_store, :key => '_osm_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rake db:sessions:create")
-# OpenStreetMap::Application.config.session_store :active_record_store
+if STATUS == :database_offline or STATUS == :database_readonly
+  OpenStreetMap::Application.config.session_store :cookie_store, :key => '_osm_session'
+else
+  ActiveRecord::SessionStore.session_class = ActiveRecord::SessionStore::SqlBypass
+  OpenStreetMap::Application.config.session_store :active_record_store, :key => '_osm_session'
+end