From 775656cc8b83b433bcb2a424bcfd1d0b53ba13c0 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Sat, 24 Apr 2021 13:10:55 +0000
Subject: [PATCH] Merge branch '1160-systemd-fix' into 'develop'
Resolve "funkwhale-worker.service error option --concurrency"
Closes #1160
See merge request funkwhale/funkwhale!1296
(cherry picked from commit 31413fe6316b5b993e3193152764d9febf11f66d)
d3fdce07 Correctly set default value in systemd unit
942d0d14 Add changelog fragment
---
changes/changelog.d/1160.bugfix | 1 +
deploy/funkwhale-worker.service | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 changes/changelog.d/1160.bugfix
diff --git a/changes/changelog.d/1160.bugfix b/changes/changelog.d/1160.bugfix
new file mode 100644
index 0000000000..ba01f1114f
--- /dev/null
+++ b/changes/changelog.d/1160.bugfix
@@ -0,0 +1 @@
+Fixed systemd unit for funkwhale-worker (#1160)
diff --git a/deploy/funkwhale-worker.service b/deploy/funkwhale-worker.service
index fbc2420819..934263bd6d 100644
--- a/deploy/funkwhale-worker.service
+++ b/deploy/funkwhale-worker.service
@@ -7,8 +7,9 @@ PartOf=funkwhale.target
User=funkwhale
# adapt this depending on the path of your funkwhale installation
WorkingDirectory=/srv/funkwhale/api
+Environment="CELERYD_CONCURRENCY=0"
EnvironmentFile=/srv/funkwhale/config/.env
-ExecStart=/srv/funkwhale/virtualenv/bin/celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY-0}
+ExecStart=/srv/funkwhale/virtualenv/bin/celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY}
[Install]
--
GitLab