X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=284d09287437fec7b705687a5b28f7fc887285fa;hb=dfad24d0685c09c19dc0aaa2f11adf39d57a363b;hp=513725d12d039dff43959fd28e95182438ea2343;hpb=b409a33843abb3221edd27016558c39cf33a6510;p=wrw.git

diff --git a/wrw/session.py b/wrw/session.py
index 513725d..284d092 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -76,7 +76,6 @@ class db(object):
         self.cookiename = cookiename
         self.path = path
         self.lock = threading.Lock()
-        self.lastuse = 0
         self.cthread = None
         self.freezetime = 3600
 
@@ -99,18 +98,17 @@ class db(object):
 
     def cleanloop(self):
         try:
-            lastuse = self.lastuse
-            while self.lastuse >= lastuse:
-                lastuse = self.lastuse
+            while True:
                 time.sleep(300)
                 self.clean()
+                if len(self.live) == 0:
+                    break
         finally:
             with self.lock:
                 self.cthread = None
 
     def fetch(self, req):
         now = int(time.time())
-        self.lastuse = now
         sessid = cookie.get(req, self.cookiename)
         with self.lock:
             if self.cthread is None:
@@ -131,18 +129,17 @@ class db(object):
             except KeyError:
                 sess = session()
                 self.live[sess.id] = sess
-                req.oncommit(self.addcookie)
+                sess.new = True
         req.oncommit(self.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)
+        sess = self.get(req)
         if sess.dirty():
             try:
+                if getattr(sess, "new", False):
+                    cookie.add(req, self.cookiename, sess.id, self.path)
+                    del sess.new
                 self.freeze(sess)
             except:
                 pass
@@ -153,6 +150,9 @@ class db(object):
     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)
@@ -189,4 +189,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)