celery settings

Former-commit-id: 521aefd43d17a5f1d930fcf15ae7f8076ec6563b [formerly 687fa16375ab5a7fddef707a9781124f72e7a7db]
Former-commit-id: 8d4b2c23c37c11b5e62117780b71be636f80ee0b

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:

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"

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"),
     }
 }

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