Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidied up sessions' freezechecking.
[wrw.git]
/
wrw
/
session.py
diff --git
a/wrw/session.py
b/wrw/session.py
index
d088ad7
..
2abe650
100644
(file)
--- a/
wrw/session.py
+++ b/
wrw/session.py
@@
-1,5
+1,5
@@
import threading, time, pickle, random, os
import threading, time, pickle, random, os
-
from .
import cookie
+import cookie
__all__ = ["db", "get"]
__all__ = ["db", "get"]
@@
-110,6
+110,7
@@
class db(object):
def fetch(self, req):
now = int(time.time())
sessid = cookie.get(req, self.cookiename)
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)
with self.lock:
if self.cthread is None:
self.cthread = threading.Thread(target = self.cleanloop)
@@
-129,27
+130,28
@@
class db(object):
except KeyError:
sess = session()
self.live[sess.id] = sess
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
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 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)
class backeddb(db):
def __init__(self, backdb, *args, **kw):
super(backeddb, self).__init__(*args, **kw)
@@
-186,4
+188,4
@@
class dirback(object):
default = backeddb(dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
def get(req):
default = backeddb(dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
def get(req):
- return
req.item(default.fetch
)
+ return
default.get(req
)