Changeset 650
- Timestamp:
- 09/18/07 18:40:02 (1 year ago)
- Files:
-
- trunk/app_generators/merb/templates/config/merb.yml (modified) (1 diff)
- trunk/lib/merb/session/memory_session.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app_generators/merb/templates/config/merb.yml
r618 r650 17 17 # which memory store to use. Built-in options are: memory, cookie, or mem_cache 18 18 #:session_store: sequel 19 20 #:memory_session_ttl: 3600 # one hour 19 21 20 22 # A secret key is required when using the 'cookie' session store (default), trunk/lib/merb/session/memory_session.rb
r623 r650 91 91 class << self 92 92 93 def setup(opts={}) 94 @opts = opts 93 def setup(ttl=nil) 95 94 @sessions = Hash.new 96 95 @timestamps = Hash.new 97 96 @mutex = Mutex.new 98 @session_ttl = opts.fetch(:session_ttl, 60*60)# default 1 hour97 @session_ttl = ttl || 60*60 # default 1 hour 99 98 start_timer 100 99 self … … 153 152 end # end MemorySessionContainer 154 153 end 154 155 Merb::MemorySessionContainer.setup(Merb::Server.config[:memory_session_ttl])
