Merge remote-tracking branch 'remotes/origin/locky' into test

Ansjer/cn_config/formal_settings.py

@@ -94,8 +94,13 @@ DATABASES = {
         'PASSWORD': DATABASES_PASS,
         'HOST': SERVER_HOST,
         'PORT': '3306',
-        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-        'AUTOCOMMIT': True
+        'AUTOCOMMIT': True,
+        'CONN_MAX_AGE': 60,
+        'OPTIONS': {
+            'charset': 'utf8mb4',
+            'use_unicode': True,
+            'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
+        }
     },
     'mysql02': {
         'ENGINE': 'django.db.backends.mysql',
@@ -104,8 +109,13 @@ DATABASES = {
         'PASSWORD': DATABASES_PASS2,
         'HOST': SERVER_HOST2,
         'PORT': '3306',
-        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-        'AUTOCOMMIT': True
+        'AUTOCOMMIT': True,
+        'CONN_MAX_AGE': 60,
+        'OPTIONS': {
+            'charset': 'utf8mb4',
+            'use_unicode': True,
+            'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
+        }
     }
 }
 DATABASE_ROUTERS = ['Ansjer.database_router.DatabaseAppsRouter']

Ansjer/cn_config/test_settings.py

@@ -92,8 +92,13 @@ DATABASES = {
         'PASSWORD': DATABASES_PASS,
         'HOST': SERVER_HOST,
         'PORT': '3306',
-        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-        'AUTOCOMMIT': True
+        'AUTOCOMMIT': True,
+        'CONN_MAX_AGE': 60,
+        'OPTIONS': {
+            'charset': 'utf8mb4',
+            'use_unicode': True,
+            'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
+        }
     },
     'mysql02': {
         'ENGINE': 'django.db.backends.mysql',
@@ -102,8 +107,13 @@ DATABASES = {
         'PASSWORD': DATABASES_PASS2,
         'HOST': SERVER_HOST2,
         'PORT': '3306',
-        'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-        'AUTOCOMMIT': True
+        'AUTOCOMMIT': True,
+        'CONN_MAX_AGE': 60,
+        'OPTIONS': {
+            'charset': 'utf8mb4',
+            'use_unicode': True,
+            'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
+        }
     },
 }