Tidied up sessions' freezechecking.

[wrw.git] / wrw / session.py

diff --git a/wrw/session.py b/wrw/session.py
index 1fded4a..2abe650 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -110,6 +110,7 @@ class db(object):
     def fetch(self, req):
         now = int(time.time())
         sessid = cookie.get(req, self.cookiename)
+        new = False
         with self.lock:
             if self.cthread is None:
                 self.cthread = threading.Thread(target = self.cleanloop)
@@ -129,28 +130,28 @@ class db(object):
             except KeyError:
                 sess = session()
                 self.live[sess.id] = sess
-                req.oncommit(self.addcookie)
-        req.oncommit(self.ckfreeze)
+                new = True
+
+        def ckfreeze(req):
+            if sess.dirty():
+                try:
+                    if new:
+                        cookie.add(req, self.cookiename, sess.id, self.path)
+                    self.freeze(sess)
+                except:
+                    pass
+        req.oncommit(ckfreeze)
         return sess
 
-    def addcookie(self, req):
-        sess = req.item(self.fetch)
-        cookie.add(req, self.cookiename, sess.id, self.path)
-
-    def ckfreeze(self, req):
-        sess = req.item(self.fetch)
-        if sess.dirty():
-            try:
-                self.freeze(sess)
-            except:
-                pass
-
     def thaw(self, sessid):
         raise KeyError()
 
     def freeze(self, sess):
         raise TypeError()
 
+    def get(self, req):
+        return req.item(self.fetch)
+
 class backeddb(db):
     def __init__(self, backdb, *args, **kw):
         super(backeddb, self).__init__(*args, **kw)
@@ -187,4 +188,4 @@ class dirback(object):
 default = backeddb(dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
 
 def get(req):
-    return req.item(default.fetch)
+    return default.get(req)