delete, [skip ci]: moar children trouble

CenterForOpenScience · Nov 9, 2021 · 844fad2 · 844fad2
1 parent 1988d50
commit 844fad2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/waterbutler/server/settings.py b/waterbutler/server/settings.py
@@ -46,14 +46,12 @@
 # test env envar mapping
 ENABLE_RATE_LIMITING = True
 
-TEMP_REDIS_DOMAIN = settings.get('S3WB_REDIS_PORT_6379_TCP_ADDR')
-if TEMP_REDIS_DOMAIN is not None:
-    print('SETTING REDIS_DOMAIN to: "{}"'.format(TEMP_REDIS_DOMAIN))
-    REDIS_DOMAIN = TEMP_REDIS_DOMAIN
-
-TEMP_REDIS_PORT = settings.get('S3WB_REDIS_PORT_6379_TCP_PORT')
-if TEMP_REDIS_PORT is not None:
-    REDIS_PORT = TEMP_REDIS_PORT
+if settings.TEMP_REDIS_DOMAIN is not None:
+    print('SETTING REDIS_DOMAIN to: "{}"'.format(settings.TEMP_REDIS_DOMAIN))
+    REDIS_DOMAIN = settings.TEMP_REDIS_DOMAIN
+
+if settings.TEMP_REDIS_PORT is not None:
+    REDIS_PORT = settings.TEMP_REDIS_PORT
 
 RATE_LIMITING_FIXED_WINDOW_SIZE = 36
 RATE_LIMITING_FIXED_WINDOW_LIMIT = 36
diff --git a/waterbutler/settings.py b/waterbutler/settings.py
@@ -184,3 +184,7 @@ def child(key):
 WEBDAV_METHODS = {'PROPFIND', 'MKCOL', 'MOVE', 'COPY'}
 
 AIOHTTP_TIMEOUT = int(config.get('AIOHTTP_TIMEOUT', 3600))  # time in seconds
+
+# test env envar mapping
+TEMP_REDIS_DOMAIN = config.get('S3WB_REDIS_PORT_6379_TCP_ADDR')
+TEMP_REDIS_PORT = config.get('S3WB_REDIS_PORT_6379_TCP_PORT')