From 38c8db00373b1187e2ab8d69ee0d56c284a21a7d Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Thu, 19 Apr 2018 14:45:33 -0400 Subject: [PATCH] Changed DEBUG default, added restart on failure on all services --- .env | 2 +- docker-compose.nodeodm.yml | 1 + docker-compose.yml | 3 +++ webodm/settings.py | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.env b/.env index c074bc8e..ddbb88a9 100644 --- a/.env +++ b/.env @@ -5,5 +5,5 @@ WO_SSL=NO WO_SSL_KEY= WO_SSL_CERT= WO_SSL_INSECURE_PORT_REDIRECT=80 -WO_DEBUG=YES +WO_DEBUG=NO WO_BROKER=redis://broker diff --git a/docker-compose.nodeodm.yml b/docker-compose.nodeodm.yml index 7f3c848a..3de13079 100644 --- a/docker-compose.nodeodm.yml +++ b/docker-compose.nodeodm.yml @@ -13,3 +13,4 @@ services: container_name: node-odm-1 ports: - "3000" + restart: on-failure:10 diff --git a/docker-compose.yml b/docker-compose.yml index d73bf8c0..4609f14b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ services: - "5432" volumes: - dbdata:/var/lib/postgresql/data + restart: on-failure:10 webapp: image: opendronemap/webodm_webapp container_name: webapp @@ -33,6 +34,7 @@ services: broker: image: redis container_name: broker + restart: on-failure:10 worker: image: opendronemap/webodm_webapp container_name: worker @@ -45,3 +47,4 @@ services: environment: - WO_BROKER - WO_DEBUG + restart: on-failure:10 diff --git a/webodm/settings.py b/webodm/settings.py index e81d0110..a0bf4e24 100644 --- a/webodm/settings.py +++ b/webodm/settings.py @@ -326,6 +326,7 @@ CELERY_ACCEPT_CONTENT = ['json'] CELERY_INCLUDE=['worker.tasks'] CELERY_WORKER_REDIRECT_STDOUTS = False CELERY_WORKER_HIJACK_ROOT_LOGGER = False +CELERYD_MAX_TASKS_PER_CHILD = 1000 if TESTING: CELERY_TASK_ALWAYS_EAGER = True