X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=24d89d7e6c3a92aa33ade7a8cdde2f43b12ab35a;hb=refs%2Fheads%2Fjython;hp=19bdb6b6195e805d5506060604a3fb6a4ba4be03;hpb=d99a17a601c0680a325338189e6eeac0eb7d7bce;p=wrw.git

diff --git a/wrw/session.py b/wrw/session.py
index 19bdb6b..24d89d7 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 import threading, time, pickle, random, os
 import cookie, env
 
@@ -164,6 +165,14 @@ class db(object):
                 self.cthread.setDaemon(True)
                 self.cthread.start()
 
+    def mksession(self, req):
+        return session(threading.RLock())
+
+    def mkcookie(self, req, sess):
+        cookie.add(req, self.cookiename, sess.id,
+                   path=self.path,
+                   expires=cookie.cdate(time.time() + sess.expire))
+
     def fetch(self, req):
         now = int(time.time())
         sessid = cookie.get(req, self.cookiename)
@@ -173,13 +182,13 @@ class db(object):
                 raise KeyError()
             sess = self._fetch(sessid)
         except KeyError:
-            sess = session(threading.RLock())
+            sess = self.mksession(req)
             new = True
 
         def ckfreeze(req):
             if sess.dirty():
                 if new:
-                    cookie.add(req, self.cookiename, sess.id, path=self.path)
+                    self.mkcookie(req, sess)
                     with self.lock:
                         self.live[sess.id] = [sess.lock, sess]
                 try: