X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=1239ecd0be6812d23d1d9dc256bf6dedbd7afa45;hb=1f61bf3134f3b46954ad012096c6ff3b398a74ef;hp=28c15771ca53a04259e28cd4fe2f5ef984370f60;hpb=bce331091338a78d07c78db6adab35911d41dea4;p=wrw.git diff --git a/wrw/session.py b/wrw/session.py index 28c1577..1239ecd 100644 --- a/wrw/session.py +++ b/wrw/session.py @@ -1,5 +1,5 @@ import threading, time, pickle, random, os -import cookie +import cookie, env __all__ = ["db", "get"] @@ -71,13 +71,14 @@ class session(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.backdb = backdb def clean(self): now = int(time.time()) @@ -145,20 +146,8 @@ class db(object): 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) @@ -166,9 +155,14 @@ class backeddb(db): raise KeyError() def freeze(self, sess): - self.backdb[sess.id] = pickle.dumps(sess) + if self.backdb is None: + raise TypeError() + 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 @@ -186,7 +180,7 @@ class dirback(object): 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 = env.var(db(backdb = dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))) def get(req): - return default.get(req) + return default.val.get(req)