Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: fixes after libretime_worker rename

This commit is contained in:
jo 2021-12-24 00:47:44 +01:00 committed by Kyle Robbertze
parent 39c6acdd8a
commit ccb8a234b8
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/build/airtime-setup/load.php
View File

@ -172,7 +172,7 @@ function checkLiquidsoapService()
*/ */
function checkCeleryService() function checkCeleryService()
{ {
exec('pgrep -f -u celery airtime-celery', $out, $status); exec('pgrep -f -u celery libretime_worker', $out, $status);
if (array_key_exists(0, $out) && $status == 0) { if (array_key_exists(0, $out) && $status == 0) {
return 1; return 1;
} }

4
worker/Makefile
View File

@ -3,8 +3,8 @@ all: lint
include ../tools/python.mk include ../tools/python.mk
PIP_INSTALL := --editable . PIP_INSTALL := --editable .
PYLINT_ARG := airtime-celery PYLINT_ARG := libretime_worker
MYPY_ARG := airtime-celery MYPY_ARG := libretime_worker
format: .format format: .format
lint: .format-check .pylint .mypy lint: .format-check .pylint .mypy

2
worker/README.md
View File

@ -15,7 +15,7 @@ Each instance of airtime-celery has its own worker, and multiple instances can b
To debug, you can run celery directly from the command line: To debug, you can run celery directly from the command line:
```sh ```sh
RMQ_CONFIG_FILE=${LIBRETIME_CONF_DIR}/airtime.conf celery -A airtime-celery.tasks worker --loglevel=info RMQ_CONFIG_FILE=${LIBRETIME_CONF_DIR}/airtime.conf celery -A libretime_worker.tasks worker --loglevel=info
``` ```
This worker can be run alongside the service without issue. This worker can be run alongside the service without issue.

2
worker/install/systemd/libretime-celery.service
View File

@ -7,7 +7,7 @@ User=celery
Group=celery Group=celery
Environment=RMQ_CONFIG_FILE=/etc/airtime/airtime.conf Environment=RMQ_CONFIG_FILE=/etc/airtime/airtime.conf
WorkingDirectory=/srv/airtime WorkingDirectory=/srv/airtime
ExecStart=/usr/local/bin/celery worker -A airtime-celery.tasks:celery --time-limit=1800 --concurrency=1 --config=celeryconfig -l INFO ExecStart=/usr/local/bin/celery worker -A libretime_worker.tasks:celery --time-limit=1800 --concurrency=1 --config=celeryconfig -l INFO
Restart=always Restart=always
[Install] [Install]

2
worker/libretime_worker/__init__.py
View File

@ -1,4 +1,4 @@
import os import os
# Make the celeryconfig module visible to celery # Make the celeryconfig module visible to celery
os.environ["CELERY_CONFIG_MODULE"] = "airtime-celery.celeryconfig" os.environ["CELERY_CONFIG_MODULE"] = "libretime_worker.celeryconfig"

2
worker/setup.py
View File

@ -17,7 +17,7 @@ setup(
"Source Code": "https://github.com/libretime/libretime", "Source Code": "https://github.com/libretime/libretime",
}, },
license="MIT", license="MIT",
packages=["airtime-celery"], packages=["libretime_worker"],
python_requires=">=3.6", python_requires=">=3.6",
install_requires=[ install_requires=[
"celery==4.4.7", "celery==4.4.7",