From 2bb5d5535abc4ee9d2b9c6e317ec3715ae1726ef Mon Sep 17 00:00:00 2001 From: dzeranov Date: Wed, 27 Oct 2021 15:45:34 +0300 Subject: [PATCH] CVAT_EXCHANGE_URL in compose file; cvat_exchange instead of jobflow; --- .../engine/{notify_jobflow.py => notify_cvat_exchange.py} | 2 +- cvat/apps/engine/signals.py | 4 ++-- docker-compose.yml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) rename cvat/apps/engine/{notify_jobflow.py => notify_cvat_exchange.py} (95%) diff --git a/cvat/apps/engine/notify_jobflow.py b/cvat/apps/engine/notify_cvat_exchange.py similarity index 95% rename from cvat/apps/engine/notify_jobflow.py rename to cvat/apps/engine/notify_cvat_exchange.py index dfc68b37cc8b..b09d4aa04ccc 100644 --- a/cvat/apps/engine/notify_jobflow.py +++ b/cvat/apps/engine/notify_cvat_exchange.py @@ -8,7 +8,7 @@ from cvat.apps.engine.log import slogger from cvat.settings.base import CVAT_URL, CVAT_EXCHANGE_URL -def notify_jobflow(db_jobs, db_task): +def notify_cvat_exchange(db_jobs, db_task): logger = slogger.task[db_task.id] try: payouts = [] diff --git a/cvat/apps/engine/signals.py b/cvat/apps/engine/signals.py index 4717809319bb..4196a505ba84 100644 --- a/cvat/apps/engine/signals.py +++ b/cvat/apps/engine/signals.py @@ -7,7 +7,7 @@ from django.dispatch import receiver from cvat.apps.authentication.models import User -from cvat.apps.engine.notify_jobflow import notify_jobflow +from cvat.apps.engine.notify_cvat_exchange import notify_cvat_exchange from .models import ( Data, @@ -30,7 +30,7 @@ def update_task_status(instance, **kwargs): if status != db_task.status: if status == StatusChoice.COMPLETED and not db_task.is_exchange_notified: - notify_jobflow(db_jobs, db_task) + notify_cvat_exchange(db_jobs, db_task) db_task.status = status db_task.save() diff --git a/docker-compose.yml b/docker-compose.yml index 46fcbfd2ea47..80a579b51d7f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,6 +45,7 @@ services: CVAT_REDIS_HOST: 'cvat_redis' CVAT_POSTGRES_HOST: 'cvat_db' ADAPTIVE_AUTO_ANNOTATION: 'false' + CVAT_EXCHANGE_URL: 'http://human-exchange-cvat:5001' volumes: - cvat_data:/home/django/data - cvat_keys:/home/django/keys