Browse Source

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 <sergiodj@sergiodj.net>
Sergio Durigan Junior 2 years ago
parent
commit
56cfd67754

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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"]

+ 1 - 1
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"]

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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 <queue_name>
+ExecStart=/usr/bin/celery -A pagure.lib.tasks worker --loglevel=INFO -Q <queue_name>
 Environment="PAGURE_CONFIG=/etc/pagure/pagure.cfg"
 Type=simple
 User=git

+ 1 - 1
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])