- minor tweak on settings for Docker

GeoNode · May 10, 2018 · 3817742 · 3817742
1 parent ac173fc
commit 3817742
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/geonode/settings.py b/geonode/settings.py
@@ -1256,17 +1256,20 @@
     'visibility_timeout': 86400
 }
 
-ASYNC_SIGNALS = False
+ASYNC_SIGNALS = os.environ.get('ASYNC_SIGNALS', False)
 RABBITMQ_SIGNALS_BROKER_URL = 'amqp://localhost:5672'
 REDIS_SIGNALS_BROKER_URL = 'redis://localhost:6379/0'
 LOCAL_SIGNALS_BROKER_URL = 'memory://'
+
 if ASYNC_SIGNALS:
-    _BROKER_URL = RABBITMQ_SIGNALS_BROKER_URL
-    # _BROKER_URL = REDIS_SIGNALS_BROKER_URL
+    _BROKER_URL = os.environ.get('BROKER_URL', RABBITMQ_SIGNALS_BROKER_URL)
+    # _BROKER_URL =  = os.environ.get('BROKER_URL', REDIS_SIGNALS_BROKER_URL)
+
     CELERY_RESULT_BACKEND = _BROKER_URL
 else:
     _BROKER_URL = LOCAL_SIGNALS_BROKER_URL
-BROKER_URL = os.environ.get('BROKER_URL', _BROKER_URL)
+
+BROKER_URL = _BROKER_URL
 
 CELERY_RESULT_PERSISTENT = False
 

diff --git a/scripts/docker/env/production/django.env b/scripts/docker/env/production/django.env
@@ -7,6 +7,7 @@ GEONODE_DATABASE=geonode
 GEONODE_DATABASE_PASSWORD=geonode
 GEONODE_GEODATABASE=geonode_data
 GEONODE_GEODATABASE_PASSWORD=geonode_data
+ASYNC_SIGNALS=True
 BROKER_URL=amqp://guest:guest@rabbitmq:5672/
 DJANGO_SETTINGS_MODULE=geonode.settings
 ALLOWED_HOSTS=['django',]