Merge branch 'redis-session-expire-delay' into 'master'

Fix reading session_expire_delay The error occurs when application settings are not yet created and migrations are not yet done. See merge request !1268

Merge branch 'redis-session-expire-delay' into 'master'
1ba26b4d · Dmitriy Zaporozhets · 0d41b2dd · 0d66d4d3 · 1ba26b4d
Commit 1ba26b4d authored Sep 09, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

session_store.rb config/initializers/session_store.rb +6 -1

No files found.
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,7 +2,12 @@

 require 'gitlab/current_settings'
 include Gitlab::CurrentSettings
-Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay
+
+# allow it to fail: it may to do so when create_from_defaults is executed before migrations are actually done
+begin
+  Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay
+rescue
+end

 Gitlab::Application.config.session_store(
  :redis_store, # Using the cookie_store would enable session replay attacks.