From 7f0d8b8aa9460546966c2552bedf4744dc897c0b Mon Sep 17 00:00:00 2001
From: "Hartung, Michael" <michael.hartung@uni-hamburg.de>
Date: Mon, 16 May 2022 16:41:51 +0200
Subject: [PATCH] celery settings
Former-commit-id: 5742046b6c9607ab7644fbc4d56fcf5a165aa0ef
---
docker-compose.yml | 16 ++++++++++------
docker-entrypoint.sh | 8 +++++++-
netex/settings.py | 2 +-
requirements.txt | 2 +-
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index c40e05c..56e516f 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,23 +45,27 @@ services:
hostname: redis
networks:
- redis_net
-
celery:
restart: always
- build: ./backend
+ build: .
command: celery -A core worker -l info
volumes:
- - ./backend/:/usr/src/app/
+ - ./:/usr/src/app/
depends_on:
- redis
-
+ - db
+ networks:
+ - redis_net
celery-beat:
- build: ./backend
+ build: .
command: celery -A core beat -l info
volumes:
- - ./backend/:/usr/src/app/
+ - ./:/usr/src/app/
depends_on:
- redis
+ - db
+ networks:
+ - redis_net
networks:
db_net:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 2b49875..28a92a0 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -3,6 +3,12 @@
python3 manage.py migrate --run-syncdb
python3 manage.py createfixtures
python3 manage.py cleanuptasks
-# sh import-data.sh
+
+file="docker-entrypoint.lock"
+# exit if entrypoint.lock exists to prevent new import of data every time docker is restarted
+if ! test -f "$file"; then
+ sh import-data.sh
+ touch $file
+fi
/usr/bin/supervisord -c "/etc/supervisor/conf.d/supervisord.conf"
diff --git a/netex/settings.py b/netex/settings.py
index b232a9b..9fff6f6 100755
--- a/netex/settings.py
+++ b/netex/settings.py
@@ -179,6 +179,6 @@ CELERY_RESULT_BACKEND = "redis://redis:6379"
CELERY_BEAT_SCHEDULE = {
"update_db": {
"task": "control.celery_tasks.task_update_db_from_nedrex",
- "schedule": crontab(hour=12, minute=15, day_of_week='sun'),
+ "schedule": crontab(minute="*/3"),
}
}
diff --git a/requirements.txt b/requirements.txt
index 6ea24ad..25c7c16 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,4 +29,4 @@ six==1.15.0
sqlparse==0.3.1
urllib3==1.25.10
sqlalchemy==1.3.23
-celery==5.2.6
\ No newline at end of file
+celery==5.1.2
\ No newline at end of file
--
GitLab