Changeset 1245
- Timestamp:
- 01/09/08 18:51:23 (9 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/jerbivore/ext/merb-servlet/src/jerbivore/MerbServlet.java
r892 r1245 111 111 "end\n" + 112 112 "Merb::Server.send :class_variable_set, :@@merb_opts, options\n" + 113 "Merb:: Server.initialize_merb\n" +113 "Merb::BootLoader.initialize_merb\n" + 114 114 "Jerbivore::ServletHandler.path_prefix = Merb::Server.config[:path_prefix]\n"; 115 115 runtime.executeScript(merbInitScript, "MerbServlet:merbInitScript"); plugins/merb_activerecord/lib/merb/orms/active_record/connection.rb
r1244 r1245 34 34 35 35 ::ActiveRecord::Base.verification_timeout = 14400 36 ::ActiveRecord::Base.logger = Merb. environment_LOGGER36 ::ActiveRecord::Base.logger = Merb.logger 37 37 ::ActiveRecord::Base.establish_connection config 38 38 else plugins/merb_activerecord/lib/merb/session/active_record_session.rb
r1241 r1245 1 require 'active_record'1 require "active_record" 2 2 3 3 module Merb 4 4 module SessionMixin 5 5 def setup_session 6 Merb. environment_LOGGER.info("Setting up session")6 Merb.logger.info("Setting up session") 7 7 before = cookies[_session_id_key] 8 8 request.session, cookies[_session_id_key] = Merb::ActiveRecordSession.persist(cookies[_session_id_key]) … … 12 12 13 13 def finalize_session 14 Merb. environment_LOGGER.info("Finalize session")14 Merb.logger.info("Finalize session") 15 15 request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash 16 16 set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
