Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split the dirty management out from sessiondata.
[wrw.git]
/
wrw
/
session.py
diff --git
a/wrw/session.py
b/wrw/session.py
index
513725d
..
28c1577
100644
(file)
--- 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.cookiename = cookiename
self.path = path
self.lock = threading.Lock()
- self.lastuse = 0
self.cthread = None
self.freezetime = 3600
self.cthread = None
self.freezetime = 3600
@@
-99,19
+98,19
@@
class db(object):
def cleanloop(self):
try:
def cleanloop(self):
try:
- lastuse = self.lastuse
- while self.lastuse >= lastuse:
- lastuse = self.lastuse
+ while True:
time.sleep(300)
self.clean()
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())
finally:
with self.lock:
self.cthread = None
def fetch(self, req):
now = int(time.time())
- self.lastuse = now
sessid = cookie.get(req, self.cookiename)
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)
@@
-130,29
+129,30
@@
class db(object):
sess.atime = now
except KeyError:
sess = session()
sess.atime = now
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():
+ if new:
+ cookie.add(req, self.cookiename, sess.id, self.path)
+ with self.lock:
+ self.live[sess.id] = sess
+ try:
+ self.freeze(sess)
+ except:
+ pass
+ req.oncommit(ckfreeze)
return sess
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 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)
@@
-189,4
+189,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
)