fixes from docker testing

oduwsdl · Jun 12, 2019 · 18acde304908b8d44696365906a4d756b3afe319 · 18acde3
1 parent 10cbe77
commit 18acde304908b8d44696365906a4d756b3afe319
Unified Split

Showing with 9 additions and 9 deletions.

+1 −1 docs/source/conf.py

+4 −7 mementoembed/__init__.py

+1 −1 mementoembed/version.py

+3 −0 sample_appconfig.cfg
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-  
-release = '0.2019.06.12.215136'
+  
+release = '0.2019.06.12.223213'
 # -- General configuration ---------------------------------------------------

diff --git a/mementoembed/__init__.py b/mementoembed/__init__.py
@@ -10,8 +10,7 @@
 from time import strftime
-  
-from redis import RedisError
-  
-from redis_namespace import StrictRedis
+  
+from redis import RedisError, StrictRedis
 from flask import Flask, request, render_template, make_response, current_app
 from .memstock.uricache import RedisCache, NoCache
@@ -58,17 +57,15 @@ def getURICache():
            host=current_app.config["CACHE_DBHOST"],
            port=current_app.config["CACHE_DBPORT"],
            password=current_app.config["CACHE_DBPASSWORD"],
-  
-            db=current_app.config["CACHE_DBNUMBER"],
-  
-            namespace='uricache:'
+  
+            db=current_app.config["CACHE_DBNUMBER"]
        )
        return requests_cache.CachedSession(
            cache_name="uricache",
            backend="redis",
-  
-            expire_after=current_app.config['URICACHE_EXPIRATION'],
+  
+            expire_after=int(current_app.config['URICACHE_EXPIRATION']),
            old_data_on_error=True,
-  
-            connection=conn,
-  
-            namespace='uricache'
+  
+            connection=conn
            )
    else:

diff --git a/mementoembed/version.py b/mementoembed/version.py
@@ -1,3 +1,3 @@
 __appname__ = "MementoEmbed"
-  
-__appversion__ = '0.2019.06.12.215136'
+  
+__appversion__ = '0.2019.06.12.223213'
 __useragent__ = "{}/{}".format(__appname__, __appversion__)
diff --git a/sample_appconfig.cfg b/sample_appconfig.cfg
@@ -14,6 +14,9 @@ CACHE_DBPORT = "6379"
 # CACHEDB only has meaning for Redis, specifying the Redis database to use
 CACHE_DBNUMBER = "1"
+  
+# CACHE_DBPASSWORD only has meaning for Redis, specifying the password to the Redis database
+  
+CACHE_DBPASSWORD = ""
+  
+
 # CACHE_EXPIRETIME indicates how often to expire entries in the cache
 URICACHE_EXPIRATION = "604800"