diff roundup/backends/back_anydbm.py @ 6814:3f60a71b0812

Summary: Support selecion session/otk data store. Add redis as data store. Allow admin to select the backend data store. Compatibility matrix: main\/ session>| anydbm | sqlite | redis | mysql | postgresql | anydbm | D | | X | | | sqlite | X | D | X | | | mysql | | | | D | | postgresql | | | | | D | --------------------------------------------------------------+ D - default if unconfigured, X - compatible choice DETAILS roundup/configuration.py: add config.ini section sessiondb with settings: backend and redis_url. CHANGES.txt, doc/admin_guide.txt, doc/installation.txt, doc/upgrading.txt: doc on config of session db and redis. Plus some other fixes: admin - clarified why we do not drop __words and __testids table in native-fts conversion. TYpo fix. upgrading - doc how you can keep using anydbm for session data with sqlite. Fix dupe sentence in an upgrading config.ini section. roundup/backends/back_anydbm.py, roundup/backends/back_sqlite.py: code to support redis, redis/anydbm backends respectively. roundup/backends/sessions_redis.py new storage backend for redis. roundup/rest.py, roundup/cgi/actions.py, roundup/cgi/templating.py redis uses a different way of calculating lifetime/timestamp. Since expiration of an item occurred if its timestamp was more than 1 week old, code would calculate: now - 1 week + lifetime. But this results in faster expiration in redis if used for lifetime/timestamp. Convert code to use the lifetime() method in BasicDatabase that generates the right timestamp for each backend. test/session_common.py: added tests for more cases, get without default, getall non-existing key etc. timestamp test changed to use new self.get_ts which is overridden in other tests. Test that datatypes survive storage. test/test_redis_session.py: test redis session store with sqlite and anydbm primary databases test/test_anydbm.py, test/test_sqlite.py add test to make sure the databases are properly set up sqlite - add test cases where anydbm is used as datastore anydbm - remove updateTimestamp override add get_ts(). test/test_config.py tests on redis_url and compatibility on choice of sessiondb backend .travis.yml: add redis db and redis-py
author John Rouillard <rouilj@ieee.org>
date Thu, 04 Aug 2022 14:41:58 -0400
parents 408fd477761f
children feb175271f3e
line wrap: on
line diff
--- a/roundup/backends/back_anydbm.py	Wed Aug 03 17:34:58 2022 -0400
+++ b/roundup/backends/back_anydbm.py	Thu Aug 04 14:41:58 2022 -0400
@@ -33,7 +33,12 @@
 from roundup.i18n import _
 
 from roundup.backends.blobfiles import FileStorage
-from roundup.backends.sessions_dbm import Sessions, OneTimeKeys
+from roundup.backends import sessions_dbm
+
+try:
+    from roundup.backends import sessions_redis
+except ModuleNotFoundError:
+    sessions_redis = None
 
 from roundup.backends.indexer_common import get_indexer
 
@@ -133,12 +138,26 @@
 
     def getSessionManager(self):
         if not self.Session:
-            self.Session = Sessions(self)
+            if self.config.SESSIONDB_BACKEND == "redis":
+                if sessions_redis is None:
+                    self.Session = sessions_dbm.Sessions(self)
+                    raise ValueError("[redis] session is set, but "
+                                     "redis is not found")
+                self.Session = sessions_redis.Sessions(self)
+            else:
+                self.Session = sessions_dbm.Sessions(self)
         return self.Session
 
     def getOTKManager(self):
         if not self.Otk:
-            self.Otk = OneTimeKeys(self)
+            if self.config.SESSIONDB_BACKEND == "redis":
+                if sessions_redis is None:
+                    self.Session = sessions_dbm.OneTimeKeys(self)
+                    raise ValueError("[redis] session is set, but "
+                                     "redis is not found")
+                self.Otk = sessions_redis.OneTimeKeys(self)
+            else:
+                self.Otk = sessions_dbm.OneTimeKeys(self)
         return self.Otk
 
     def reindex(self, classname=None, show_progress=False):

Roundup Issue Tracker: http://roundup-tracker.org/