Increase worker timeout, use mysql 5

diff --git a/app/settings.py b/app/settings.py
index ba93883cc33ded9cc4402e628d7793d329e995e5..53358d04f95eccd83e2cfd16d0f4bdd917da74e3 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -317,6 +317,7 @@ HAYSTACK_CONNECTIONS = {
         #'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
         'ENGINE': 'telemeta.util.backend.CustomElasticEngine',
         'URL': env('HAYSTACK_URL'),
+        'TIMEOUT': 60 * 5,
         'INDEX_NAME': env('HAYSTACK_INDEX_NAME'),
         'INLUDE_SPELLING': True,
         'EXCLUDED_INDEXES': ['telemeta.search_indexes.LocationIndex',
@@ -329,6 +330,7 @@ HAYSTACK_CONNECTIONS = {
         # 'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
         'ENGINE': 'telemeta.util.backend.CustomElasticEngine',
         'URL': env('HAYSTACK_URL'),
+        'TIMEOUT': 60 * 5,
         'INDEX_NAME': env('HAYSTACK_INDEX_NAME_AUTOCOMPLETE'),
         'INLUDE_SPELLING': True,
         'EXCLUDED_INDEXES': ['telemeta.search_indexes.MediaItemIndex',

diff --git a/docker-compose.yml b/docker-compose.yml
index 7f1de7cbe712013027549c35e10922006cb727ed..7aeb01b109d7843ecf0a85b763c371a92bc11b6e 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,7 +39,7 @@ data:
   command: "true"
 
 db:
-  image: mysql
+  image: mysql:5
   volumes:
     - ./scripts/:/srv/scripts
     - ./data/mysql/:/var/lib/mysql