Explicitly unset redis host

openspending · May 22, 2018 · 9aa764b · 9aa764b
1 parent 91d9ed9
commit 9aa764b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/conductor/blueprints/logger.py b/conductor/blueprints/logger.py
@@ -10,5 +10,3 @@
 
 es_logger = logging.getLogger('elasticsearch')
 es_logger.setLevel(logging.INFO)
-
-
diff --git a/conductor/blueprints/package/controllers.py b/conductor/blueprints/package/controllers.py
@@ -23,6 +23,8 @@
 runner = DppRunner(max_workers=4)
 
 os.environ['DPP_DB_ENGINE'] = os.environ['OS_CONDUCTOR_ENGINE']
+if 'DPP_REDIS_HOST' in os.environ:
+    del os.eniron['DPP_REDIS_HOST']
 os.environ['ELASTICSEARCH_ADDRESS'] = os.environ['OS_ELASTICSEARCH_ADDRESS']
 os.environ['AWS_ACCESS_KEY_ID'] = os.environ['OS_ACCESS_KEY_ID']
 os.environ['AWS_SECRET_ACCESS_KEY'] = os.environ['OS_SECRET_ACCESS_KEY']

diff --git a/conductor/blueprints/user/controllers.py b/conductor/blueprints/user/controllers.py
@@ -30,7 +30,7 @@ def readfile_or_default(filename, default):
     credentials = base64.decodebytes(credentials)
     credentials = zlib.decompress(credentials).decode('ascii')
     credentials = json.loads(credentials)
-except Exception as _:
+except Exception:
     credentials = {}
 
 PUBLIC_KEY = credentials.get('public.pem', '''-----BEGIN PUBLIC KEY-----