ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log unmarshalling errors in encrypted_cookie_store 

Change-Id: Idf8de2200b3f399f7e0dec7b5262678bd63248be
Reviewed-on: https://gerrit.instructure.com/39298
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
This commit is contained in:
James Williams 2014-08-14 08:41:24 -06:00
parent fbc53265e4
commit 3a2a2f579d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.d/other_stuff.rb
View File

@ -5,7 +5,7 @@ gem 'active_model_serializers', '0.9.0alpha1',
gem 'authlogic', '3.3.0'
gem 'active_model-better_errors', '1.6.7', :require => 'active_model/better_errors'
gem 'dynamic_form', '1.1.4'
gem 'encrypted_cookie_store-instructure', '1.1.4', :require => 'encrypted_cookie_store'
gem 'encrypted_cookie_store-instructure', '1.1.6', :require => 'encrypted_cookie_store'
gem 'rails-patch-json-encode', '0.0.1'
gem 'rack', '1.4.5'
gem 'routing_concerns', '0.1.0'

3
config/initializers/session_store.rb
View File

@ -17,6 +17,7 @@ config = {
# RedisSessionStore, and EncryptedCookieStore)
config[:expire_after] ||= 1.day
config[:expires] = nil
config[:logger] = Rails.logger
session_store = config.delete(:session_store).to_sym
case session_store
@ -37,4 +38,4 @@ when :redis_session_store
end
CanvasRails::Application.config.session_store(session_store, config)
CanvasRails::Application.config.secret_token = config[:secret]
CanvasRails::Application.config.secret_token = config[:secret]