Fix flower docker command

LayerManager · Nov 18, 2021 · 91e2ea9 · 91e2ea9
1 parent 73e4c53
commit 91e2ea9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docker-compose.demo.yml b/docker-compose.demo.yml
@@ -54,7 +54,7 @@ services:
       container_name: flower
       image: layman:latest
       user: ${UID_GID}
-      command: bash -c "cd src && python3 wait_for_deps.py && python3 -m flower -A layman.celery_app --port=5555 --url_prefix=flower"
+      command: bash -c "cd src && python3 wait_for_deps.py && celery -A layman.celery_app flower --port=5555 --url_prefix=flower"
       env_file: .env
       environment:
         - LAYMAN_SKIP_REDIS_LOADING=true

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -57,7 +57,7 @@ services:
       container_name: flower
       image: layman_dev:latest
       user: ${UID_GID}
-      command: bash -c "cd src && python3 wait_for_deps.py && python3 -m flower -A layman.celery_app --port=5555"
+      command: bash -c "cd src && python3 wait_for_deps.py && celery -A layman.celery_app flower --port=5555"
       env_file: .env
       environment:
         - LAYMAN_SKIP_REDIS_LOADING=true

diff --git a/src/layman/__init__.py b/src/layman/__init__.py
@@ -9,7 +9,7 @@
 
 IN_CELERY_WORKER_PROCESS = sys.argv and sys.argv[0].endswith('/celery/__main__.py')
 IN_PYTEST_PROCESS = sys.argv and sys.argv[0].endswith('/pytest/__main__.py')
-IN_FLOWER_PROCESS = sys.argv and sys.argv[0].endswith('/flower/__main__.py')
+IN_FLOWER_PROCESS = sys.argv and sys.argv[0].endswith('/usr/local/bin/celery')
 IN_FLASK_PROCESS = sys.argv and (sys.argv[0].endswith('/flask') or sys.argv[0].endswith('/gunicorn'))
 IN_UPGRADE_PROCESS = sys.argv and sys.argv[0].endswith('standalone_upgrade.py')
 IN_UTIL_PROCESS = sys.argv and sys.argv[0].endswith('refresh_doc_metadata_xpath.py')
@@ -20,7 +20,7 @@
     IN_FLASK_PROCESS,
     IN_UPGRADE_PROCESS,
     IN_UTIL_PROCESS,
-].count(True) == 1, f"IN_CELERY_WORKER_PROCESS={IN_CELERY_WORKER_PROCESS}, IN_PYTEST_PROCESS={IN_PYTEST_PROCESS}, IN_FLOWER_PROCESS={IN_FLOWER_PROCESS}, IN_FLASK_PROCESS={IN_FLASK_PROCESS}, IN_UPGRADE_PROCESS={IN_UPGRADE_PROCESS}, IN_UTIL_PROCESS={IN_UTIL_PROCESS}"
+].count(True) == 1, f"IN_CELERY_WORKER_PROCESS={IN_CELERY_WORKER_PROCESS}, IN_PYTEST_PROCESS={IN_PYTEST_PROCESS}, IN_FLOWER_PROCESS={IN_FLOWER_PROCESS}, IN_FLASK_PROCESS={IN_FLASK_PROCESS}, IN_UPGRADE_PROCESS={IN_UPGRADE_PROCESS}, IN_UTIL_PROCESS={IN_UTIL_PROCESS}, sys.argv={sys.argv}"
 
 settings = importlib.import_module(os.environ['LAYMAN_SETTINGS_MODULE'])