X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=b46b818c52802a9ac054bea022294aff69c48563;hb=c33f2d6c068bf96c56e8e6966340f5f6e448df96;hp=d088ad7387d60dd9c8cc209c7ca44a19ca20e8ac;hpb=fed807e31c96fef8d941b34a25a1f5044b2d4e8d;p=wrw.git diff --git a/wrw/session.py b/wrw/session.py index d088ad7..b46b818 100644 --- a/wrw/session.py +++ b/wrw/session.py @@ -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 @@ -83,7 +83,7 @@ class db(object): now = int(time.time()) with self.lock: dlist = [] - for sess in self.live.itervalues(): + for sess in self.live.values(): if sess.atime + self.freezetime < now: try: if sess.dirty(): @@ -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,37 +130,38 @@ class db(object): except KeyError: sess = session() self.live[sess.id] = sess - sess.new = True - 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 ckfreeze(self, req): - sess = req.item(self.fetch) - 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 - 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) + super().__init__(*args, **kw) self.backdb = backdb def thaw(self, sessid): data = self.backdb[sessid] try: return pickle.loads(data) - except Exception, e: + except: raise KeyError() def freeze(self, sess): @@ -186,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)