From 56cfd67754a5d682304ffd99ac45e41682d903bc Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Sep 11 2021 05:54:46 +0000 Subject: Reorder celery arguments (and s/info/INFO/) After upgrading my server to Debian bullseye, I noticed that some of the pagure systemd services were not properly starting anymore. celery was complaining that it didn't recognize the "-A" argument in the "celery worker" command. A quick web search told me that the "-A" argument must be passed right after the "celery" command. After doing that, celery was now complaining that it didn't recognize "info" as a proper loglevel. After reading the error message, I noticed that it did have an INFO (all caps) loglevel, so after uppercasing the word celery finally started. I'm not entirely sure when celery started being more pedantic about its arguments (the same systemd unit was working with buster's celery), but I think it's a good idea to reflect the needed changes upstream so that others are not bit by this issue. Signed-off-by: Sergio Durigan Junior --- diff --git a/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service b/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service index 8fd39da..985e8a7 100644 --- a/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service +++ b/dev/ansible/roles/pagure-dev/files/pagure_authorized_keys_worker.service @@ -4,7 +4,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=celery -A pagure.lib.tasks worker --loglevel=info -c 1 -Q authorized_keys_queue +ExecStart=celery -A pagure.lib.tasks worker --loglevel=INFO -c 1 -Q authorized_keys_queue Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple Restart=on-failure diff --git a/dev/ansible/roles/pagure-dev/files/pagure_ci.service b/dev/ansible/roles/pagure-dev/files/pagure_ci.service index 408236b..cbe2dfc 100644 --- a/dev/ansible/roles/pagure-dev/files/pagure_ci.service +++ b/dev/ansible/roles/pagure-dev/files/pagure_ci.service @@ -5,7 +5,7 @@ Documentation=https://pagure.io/pagure [Service] Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" -ExecStart=celery -A pagure.lib.tasks worker --loglevel=info -Q pagure_ci +ExecStart=celery -A pagure.lib.tasks worker --loglevel=INFO -Q pagure_ci Type=simple User=git Group=git diff --git a/dev/ansible/roles/pagure-dev/files/pagure_webhook.service b/dev/ansible/roles/pagure-dev/files/pagure_webhook.service index 3c14cd3..5af6a93 100644 --- a/dev/ansible/roles/pagure-dev/files/pagure_webhook.service +++ b/dev/ansible/roles/pagure-dev/files/pagure_webhook.service @@ -5,7 +5,7 @@ Documentation=https://pagure.io/pagure [Service] Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" -ExecStart=celery -A pagure.lib.tasks worker --loglevel=info -Q pagure_webhook +ExecStart=celery -A pagure.lib.tasks worker --loglevel=INFO -Q pagure_webhook Type=simple User=git Group=git diff --git a/dev/ansible/roles/pagure-dev/files/pagure_worker.service b/dev/ansible/roles/pagure-dev/files/pagure_worker.service index d433318..fd30ae9 100644 --- a/dev/ansible/roles/pagure-dev/files/pagure_worker.service +++ b/dev/ansible/roles/pagure-dev/files/pagure_worker.service @@ -5,7 +5,7 @@ Documentation=https://pagure.io/pagure [Service] Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" -ExecStart=celery -A pagure.lib.tasks worker --loglevel=info +ExecStart=celery -A pagure.lib.tasks worker --loglevel=INFO Type=simple User=git Group=git diff --git a/dev/containers/logcom b/dev/containers/logcom index 9b93bb5..75550eb 100644 --- a/dev/containers/logcom +++ b/dev/containers/logcom @@ -6,7 +6,7 @@ VOLUME ["/repos"] RUN mkdir /code WORKDIR /code -ENTRYPOINT ["/usr/bin/celery-3", "-A", "pagure.lib.tasks_services", "worker", "--loglevel", "info", "-Q", "pagure_logcom"] +ENTRYPOINT ["/usr/bin/celery-3", "-A", "pagure.lib.tasks_services", "worker", "--loglevel", "INFO", "-Q", "pagure_logcom"] # Code injection is last to make optimal use of caches VOLUME ["/code"] diff --git a/dev/containers/worker b/dev/containers/worker index 994e216..0fc053f 100644 --- a/dev/containers/worker +++ b/dev/containers/worker @@ -6,7 +6,7 @@ VOLUME ["/repos"] RUN mkdir /code WORKDIR /code -ENTRYPOINT ["/usr/bin/celery-3", "-A", "pagure.lib.tasks", "worker", "--loglevel", "info"] +ENTRYPOINT ["/usr/bin/celery-3", "-A", "pagure.lib.tasks", "worker", "--loglevel", "INFO"] # Code injection is last to make optimal use of caches VOLUME ["/code"] diff --git a/files/pagure_authorized_keys_worker.service b/files/pagure_authorized_keys_worker.service index 2ba126b..5b51743 100644 --- a/files/pagure_authorized_keys_worker.service +++ b/files/pagure_authorized_keys_worker.service @@ -4,7 +4,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info -c 1 -Q authorized_keys_queue +ExecStart=/usr/bin/celery -A pagure.lib.tasks worker --loglevel=infINFO -c 1 -Q authorized_keys_queue Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/files/pagure_ci.service b/files/pagure_ci.service index 853c474..a00dc51 100644 --- a/files/pagure_ci.service +++ b/files/pagure_ci.service @@ -8,7 +8,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks_services --loglevel=info -Q pagure_ci +ExecStart=/usr/bin/celery -A pagure.lib.tasks_services worker --loglevel=INFO -Q pagure_ci Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/files/pagure_gitolite_worker.service b/files/pagure_gitolite_worker.service index d92d1c6..01abe85 100644 --- a/files/pagure_gitolite_worker.service +++ b/files/pagure_gitolite_worker.service @@ -4,7 +4,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info -c 1 -Q gitolite_queue +ExecStart=/usr/bin/celery -A pagure.lib.tasks worker --loglevel=INFO -c 1 -Q gitolite_queue Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/files/pagure_loadjson.service b/files/pagure_loadjson.service index 414d318..11675d8 100644 --- a/files/pagure_loadjson.service +++ b/files/pagure_loadjson.service @@ -8,7 +8,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks_services --loglevel=info -Q pagure_loadjson +ExecStart=/usr/bin/celery -A pagure.lib.tasks_services worker --loglevel=INFO -Q pagure_loadjson Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/files/pagure_logcom.service b/files/pagure_logcom.service index 360bf9d..3d2e808 100644 --- a/files/pagure_logcom.service +++ b/files/pagure_logcom.service @@ -8,7 +8,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks_services --loglevel=info -Q pagure_logcom +ExecStart=/usr/bin/celery -A pagure.lib.tasks_services worker --loglevel=INFO -Q pagure_logcom Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/files/pagure_mirror.service b/files/pagure_mirror.service index 0605db8..b0700c2 100644 --- a/files/pagure_mirror.service +++ b/files/pagure_mirror.service @@ -13,7 +13,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks_mirror --loglevel=info -Q pagure_mirror +ExecStart=/usr/bin/celery -A pagure.lib.tasks_mirror worker --loglevel=INFO -Q pagure_mirror Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=mirror diff --git a/files/pagure_webhook.service b/files/pagure_webhook.service index fc5fc1c..39f25d7 100644 --- a/files/pagure_webhook.service +++ b/files/pagure_webhook.service @@ -8,7 +8,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks_services --loglevel=info -Q pagure_webhook +ExecStart=/usr/bin/celery -A pagure.lib.tasks_services worker --loglevel=INFO -Q pagure_webhook Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/files/pagure_worker.service b/files/pagure_worker.service index 6cb46f5..51c47a3 100644 --- a/files/pagure_worker.service +++ b/files/pagure_worker.service @@ -4,7 +4,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info +ExecStart=/usr/bin/celery -A pagure.lib.tasks worker --loglevel=INFO Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/files/pagure_worker.service.example b/files/pagure_worker.service.example index c8f172a..0195f5e 100644 --- a/files/pagure_worker.service.example +++ b/files/pagure_worker.service.example @@ -10,7 +10,7 @@ After=redis.target Documentation=https://pagure.io/pagure [Service] -ExecStart=/usr/bin/celery worker -A pagure.lib.tasks --loglevel=info -Q +ExecStart=/usr/bin/celery -A pagure.lib.tasks worker --loglevel=INFO -Q Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg" Type=simple User=git diff --git a/runworker.py b/runworker.py index 914ed15..ffe94c7 100755 --- a/runworker.py +++ b/runworker.py @@ -53,7 +53,7 @@ if args.config: config = os.path.join(here, config) env["PAGURE_CONFIG"] = config -cmd = [sys.executable, "-m", "celery", "worker", "-A", args.tasks] +cmd = [sys.executable, "-m", "celery", "-A", "worker", args.tasks] if args.queue: cmd.extend(["-Q", args.queue])