[Hardening] Fixes: db connection closed and worker hangs with celery 4.2+ celery/celery#4878

(cherry picked from commit c4b523a)

Author: afabiani

geonode/br/management/commands/backup.py

@@ -293,13 +293,11 @@ def create_geoserver_backup(self, config, settings, target_folder, ignore_errors
         r = requests.put(url + 'rest/reset/',
                          auth=HTTPBasicAuth(user, passwd))
         if r.status_code != 200:
-            if (r.status_code != 200):
-                raise ValueError('Could not reset GeoServer catalog!')
+            raise ValueError('Could not reset GeoServer catalog!')
         r = requests.put(url + 'rest/reload/',
                          auth=HTTPBasicAuth(user, passwd))
         if r.status_code != 200:
-            if (r.status_code != 200):
-                raise ValueError('Could not reload GeoServer catalog!')
+            raise ValueError('Could not reload GeoServer catalog!')
 
         error_backup = 'Could not successfully backup GeoServer ' + \
                        'catalog [{}rest/br/backup/]: {} - {}'

geonode/geoserver/createlayer/tests.py

@@ -69,7 +69,7 @@ def setUp(self):
         # createlayer must use postgis as a datastore
         # set temporary settings to use a postgis datastore
         DATASTORE_URL = 'postgis://geonode:geonode@localhost:5432/datastore'
-        postgis_db = dj_database_url.parse(DATASTORE_URL, conn_max_age=600)
+        postgis_db = dj_database_url.parse(DATASTORE_URL, conn_max_age=0)
         settings.DATABASES['datastore'] = postgis_db
         settings.OGC_SERVER['default']['DATASTORE'] = 'datastore'
 

geonode/local_settings.py.geoserver.sample

@@ -61,7 +61,7 @@ DATABASES = {
         'PASSWORD': 'geonode',
         'HOST': 'localhost',
         'PORT': '5432',
-        'CONN_MAX_AGE': 5,
+        'CONN_MAX_AGE': 0,
         'CONN_TOUT': 5,
         'OPTIONS': {
             'connect_timeout': 5,
@@ -76,7 +76,7 @@ DATABASES = {
         'PASSWORD': 'geonode',
         'HOST': 'localhost',
         'PORT': '5432',
-        'CONN_MAX_AGE': 5,
+        'CONN_MAX_AGE': 0,
         'CONN_TOUT': 5,
         'OPTIONS': {
             'connect_timeout': 5,

geonode/monitoring/tests/integration.py

@@ -85,7 +85,7 @@
     DB_PORT,
     DB_NAME
 )
-postgis_db = dj_database_url.parse(DATASTORE_URL, conn_max_age=5)
+postgis_db = dj_database_url.parse(DATASTORE_URL, conn_max_age=0)
 
 logging.getLogger('south').setLevel(logging.WARNING)
 logger = logging.getLogger(__name__)

geonode/settings.py

@@ -126,7 +126,7 @@
 # 'ENGINE': 'django.contrib.gis.db.backends.postgis'
 # see https://docs.djangoproject.com/en/1.8/ref/contrib/gis/db-api/#module-django.contrib.gis.db.backends for
 # detailed list of supported backends and notes.
-_db_conf = dj_database_url.parse(DATABASE_URL, conn_max_age=5)
+_db_conf = dj_database_url.parse(DATABASE_URL, conn_max_age=0)
 
 if 'CONN_TOUT' in _db_conf:
     _db_conf['CONN_TOUT'] = 5
@@ -146,11 +146,11 @@
                                 'postgis://\
 geonode_data:geonode_data@localhost:5432/geonode_data')
     DATABASES[os.getenv('DEFAULT_BACKEND_DATASTORE')] = dj_database_url.parse(
-        GEODATABASE_URL, conn_max_age=5
+        GEODATABASE_URL, conn_max_age=0
     )
     _geo_db = DATABASES[os.getenv('DEFAULT_BACKEND_DATASTORE')]
     if 'CONN_TOUT' in DATABASES['default']:
-        _geo_db['CONN_TOUT'] = 5
+        _geo_db['CONN_TOUT'] = DATABASES['default']['CONN_TOUT']
     if 'postgresql' in GEODATABASE_URL or 'postgis' in GEODATABASE_URL:
         _geo_db['OPTIONS'] = DATABASES['default']['OPTIONS'] if 'OPTIONS' in DATABASES['default'] else {}
         _geo_db['OPTIONS'].update({

geonode/upload/tests/integration.py

@@ -82,7 +82,7 @@
     DB_PORT,
     DB_NAME
 )
-postgis_db = dj_database_url.parse(DATASTORE_URL, conn_max_age=5)
+postgis_db = dj_database_url.parse(DATASTORE_URL, conn_max_age=0)
 
 logging.getLogger('south').setLevel(logging.WARNING)
 logger = logging.getLogger(__name__)

geonode/upload/tests/test_settings.py

@@ -72,7 +72,7 @@
         'PASSWORD': 'geonode',
         'HOST': 'localhost',
         'PORT': '5432',
-        'CONN_MAX_AGE': 5,
+        'CONN_MAX_AGE': 0,
         'CONN_TOUT': 5,
         'OPTIONS': {
             'connect_timeout': 5
@@ -85,7 +85,7 @@
         'PASSWORD': 'geonode',
         'HOST': 'localhost',
         'PORT': '5432',
-        'CONN_MAX_AGE': 5,
+        'CONN_MAX_AGE': 0,
         'CONN_TOUT': 5,
         'OPTIONS': {
             'connect_timeout': 5

package/support/geonode.local_settings

@@ -67,7 +67,7 @@ DATABASES = {
         'PASSWORD': DATABASE_PASSWORD,
         'HOST': DATABASE_HOST,
         'PORT': DATABASE_PORT,
-        'CONN_MAX_AGE': 5,
+        'CONN_MAX_AGE': 0,
         'CONN_TOUT': 5,
         'OPTIONS': {
             'connect_timeout': 5,
@@ -82,7 +82,7 @@ DATABASES = {
         'PASSWORD': DATABASE_PASSWORD,
         'HOST': DATABASE_HOST,
         'PORT': DATABASE_PORT,
-        'CONN_MAX_AGE': 5,
+        'CONN_MAX_AGE': 0,
         'CONN_TOUT': 5,
         'OPTIONS': {
             'connect_timeout': 5,