diff roundup/rest.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 9a1f5e496e6c
children fe0091279f50
line wrap: on
line diff
--- a/roundup/rest.py	Wed Aug 03 17:34:58 2022 -0400
+++ b/roundup/rest.py	Thu Aug 04 14:41:58 2022 -0400
@@ -1166,7 +1166,7 @@
         # Default OTK lifetime is 1 week. So to make different
         # lifetime, take current time, subtract 1 week and add
         # lifetime.
-        ts = time.time() - (60 * 60 * 24 * 7) + lifetime
+        ts = otks.lifetime(lifetime)
         if is_generic:
             otks.set(u2s(poe_key), uid=self.db.getuid(),
                      __timestamp=ts)
@@ -2070,8 +2070,9 @@
 
             # Calculate a timestamp that will make OTK expire the
             # unused entry 1 hour in the future
-            ts = time.time() - (60 * 60 * 24 * 7) + 3600
-            otk.set(apiLimitKey, tat=gcra.get_tat_as_string(apiLimitKey),
+            ts = otk.lifetime(3600)
+            otk.set(apiLimitKey,
+                    tat=gcra.get_tat_as_string(apiLimitKey),
                     __timestamp=ts)
             otk.commit()
 

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