Dolda2000 GitWeb
/
wrw.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f2e2dc9
)
Removed the rather unnecessary backeddb class.
author
Fredrik Tolf
<fredrik@dolda2000.com>
Sun, 1 Jan 2012 16:03:29 +0000
(17:03 +0100)
committer
Fredrik Tolf
<fredrik@dolda2000.com>
Sun, 1 Jan 2012 16:03:29 +0000
(17:03 +0100)
wrw/session.py
patch
|
blob
|
blame
|
history
diff --git
a/wrw/session.py
b/wrw/session.py
index
c45090a
..
7632449
100644
(file)
--- a/
wrw/session.py
+++ b/
wrw/session.py
@@
-71,13
+71,14
@@
class session(object):
self.lock = threading.Lock()
class db(object):
self.lock = threading.Lock()
class db(object):
- def __init__(self, cookiename = "wrwsess", path = "/"):
+ def __init__(self,
backdb = None,
cookiename = "wrwsess", path = "/"):
self.live = {}
self.cookiename = cookiename
self.path = path
self.lock = threading.Lock()
self.cthread = None
self.freezetime = 3600
self.live = {}
self.cookiename = cookiename
self.path = path
self.lock = threading.Lock()
self.cthread = None
self.freezetime = 3600
+ self.backdb = backdb
def clean(self):
now = int(time.time())
def clean(self):
now = int(time.time())
@@
-145,20
+146,8
@@
class db(object):
return sess
def thaw(self, sessid):
return sess
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)
- self.backdb = backdb
-
- def thaw(self, sessid):
+ if self.backdb is None:
+ raise KeyError()
data = self.backdb[sessid]
try:
return pickle.loads(data)
data = self.backdb[sessid]
try:
return pickle.loads(data)
@@
-166,9
+155,14
@@
class backeddb(db):
raise KeyError()
def freeze(self, sess):
raise KeyError()
def freeze(self, sess):
+ if self.backdb is None:
+ raise TypeError()
self.backdb[sess.id] = pickle.dumps(sess, -1)
sess.frozen()
self.backdb[sess.id] = pickle.dumps(sess, -1)
sess.frozen()
+ def get(self, req):
+ return req.item(self.fetch)
+
class dirback(object):
def __init__(self, path):
self.path = path
class dirback(object):
def __init__(self, path):
self.path = path
@@
-186,7
+180,7
@@
class dirback(object):
with open(os.path.join(self.path, key), "w") as out:
out.write(value)
with open(os.path.join(self.path, key), "w") as out:
out.write(value)
-default =
backeddb(
dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
+default =
db(backdb =
dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
def get(req):
return default.get(req)
def get(req):
return default.get(req)