X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=0a17c6d602120098f1fa35057fa4ba0bce131bdf;hb=26648796c1d6c3c528ad7cdb108ecb086cfa5784;hp=428c93d2bd22e9d2bceb02618f9007a4b937c6a4;hpb=b65f311ba08b247e241e29e5664759cd04a2d1d5;p=wrw.git

diff --git a/wrw/session.py b/wrw/session.py
index 428c93d..0a17c6d 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,5 +1,5 @@
 import threading, time, pickle, random, os
-import cookie, env
+from . import cookie, env
 
 __all__ = ["db", "get"]
 
@@ -11,7 +11,7 @@ def hexencode(str):
 
 def gennonce(length):
     nonce = ""
-    for i in xrange(length):
+    for i in range(length):
         nonce += chr(random.randint(0, 255))
     return nonce
 
@@ -70,6 +70,9 @@ class session(object):
             self.__dict__[k] = v
         # The proper lock is set by the thawer
 
+    def __repr__(self):
+        return "<session %s>" % self.id
+
 class db(object):
     def __init__(self, backdb = None, cookiename = "wrwsess", path = "/"):
         self.live = {}
@@ -83,7 +86,7 @@ class db(object):
     def clean(self):
         now = int(time.time())
         with self.lock:
-            clist = self.live.keys()
+            clist = list(self.live.keys())
         for sessid in clist:
             with self.lock:
                 try:
@@ -154,33 +157,44 @@ class db(object):
                 else:
                     raise Exception("Illegal session entry: " + repr(entry[1]))
 
-    def fetch(self, req):
-        now = int(time.time())
-        sessid = cookie.get(req, self.cookiename)
-        new = False
+    def checkclean(self):
         with self.lock:
             if self.cthread is None:
                 self.cthread = threading.Thread(target = self.cleanloop)
                 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)
+        new = False
         try:
             if sessid is None:
                 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, self.path)
+                    self.mkcookie(req, sess)
                     with self.lock:
                         self.live[sess.id] = [sess.lock, sess]
                 try:
                     self.freeze(sess)
                 except:
                     pass
+                self.checkclean()
         req.oncommit(ckfreeze)
         return sess
 
@@ -190,7 +204,7 @@ class db(object):
         data = self.backdb[sessid]
         try:
             return pickle.loads(data)
-        except Exception, e:
+        except:
             raise KeyError()
 
     def freeze(self, sess):