Let the namespace managers ignore options they do not support

beaker/ext/database.py

@@ -55,7 +55,7 @@ def __init__(self, namespace, url=None, sa_opts=None, optimistic=False,
         OpenResourceNamespaceManager.__init__(self, namespace)
 
         if sa_opts is None:
-            sa_opts = params
+            sa_opts = {}
 
         self.lock_dir = None
 

beaker/session.py

@@ -156,12 +156,13 @@ def __init__(self, request, id=None, invalidate_corrupt=False,
         if timeout and not save_accessed_time:
             raise BeakerException("timeout requires save_accessed_time")
         self.timeout = timeout
-        # We want to pass timeout param to redis backend to support expiration of keys
-        # In future, I believe, we can use this param for memcached and mongo as well
-        if self.timeout is not None and self.type == 'ext:redis':
-            # The backend expiration should always be a bit longer (I decied to use 2 minutes) than the
+
+        # If a timeout was provided, forward it to the backend too, so the backend
+        # can automatically expire entries if it's supported.
+        if self.timeout is not None:
+            # The backend expiration should always be a bit longer than the
             # session expiration itself to prevent the case where the backend data expires while
-            # the session is being read (PR#153)
+            # the session is being read (PR#153). 2 Minutes seems a reasonable time.
             self.namespace_args['timeout'] = self.timeout + 60 * 2
 
         self.save_atime = save_accessed_time

tests/test_managers/base.py

@@ -14,6 +14,7 @@
 
 class CacheManagerBaseTests(unittest.TestCase):
     SUPPORTS_EXPIRATION = True
+    SUPPORTS_TIMEOUT = True
     CACHE_ARGS = {}
 
     @classmethod
@@ -112,6 +113,21 @@ def test_session_invalid(self):
             Cookie='beaker.session.id=df7324911e246b70b5781c3c58328442; Path=/'))
         assert 'current value is: 2' in res
 
+    def test_session_timeout(self):
+        app = TestApp(SessionMiddleware(self.simple_session_app, timeout=1, **self.CACHE_ARGS))
+
+        session = app.app._get_session()
+        session.save()
+        if self.SUPPORTS_TIMEOUT:
+            assert session.namespace.timeout == 121
+
+        res = app.get('/')
+        assert 'current value is: 1' in res
+        res = app.get('/')
+        assert 'current value is: 2' in res
+        res = app.get('/')
+        assert 'current value is: 3' in res
+
     def test_has_key(self):
         cache = Cache('test', **self.CACHE_ARGS)
         o = object()

tests/test_managers/test_ext_mongodb.py

@@ -3,6 +3,7 @@
 
 
 class TestMongoDB(base.CacheManagerBaseTests):
+    SUPPORTS_TIMEOUT = False
     CACHE_ARGS = {
         'type': 'ext:mongodb',
         'url': 'mongodb://localhost:27017/beaker_testdb'