Fixes #4844

GeoNode · Sep 6, 2019 · 6f05643 · 6f05643
1 parent 1643283
commit 6f05643
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/geonode/settings.py b/geonode/settings.py
@@ -127,8 +127,7 @@
     if 'CONN_TOUT' in DATABASES['default']:
         _geo_db['CONN_TOUT'] = 5
     if 'postgresql' in GEODATABASE_URL or 'postgis' in GEODATABASE_URL:
-        if 'OPTIONS' not in DATABASES['default']:
-            _geo_db['OPTIONS'] = {}
+        _geo_db['OPTIONS'] = DATABASES['default'] if 'OPTIONS' in DATABASES['default'] else {}
         _geo_db['OPTIONS'].update({
             'connect_timeout': 5,
         })
@@ -1773,7 +1772,7 @@ def get_geonode_catalogue_service():
 # for current data, 1 minute resolution
 # for data older than 1 day, 1-hour resolution
 # for data older than 2 weeks, 1 day resolution
-MONITORING_DATA_AGGREGATION = (                           
+MONITORING_DATA_AGGREGATION = (
                                (timedelta(seconds=0), timedelta(minutes=1),),
                                (timedelta(days=1), timedelta(minutes=60),),
                                (timedelta(days=14), timedelta(days=1),),