j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-08 19:26:48 +00:00
Code Issues Projects Releases Wiki Activity

build: systemd runs the panel on hosts instead of supervisor

Browse source 
The installer and the manual installation install four systemd units
(webvirt-cloud, webvirt-novncd, webvirt-socketiod, webvirt-worker) that
run as the web server's user with absolute paths and read
/etc/default/webvirtcloud. gunicorn, socketiod and the worker stop with
KillMode=mixed, so they wind down their own children. supervisor, its
installer code and the contributed systemd files go; the README gets
the update, rollback and a one-time move from supervisor, and the
installer refuses to run over a supervisor install. Docker keeps runit;
novncd's runit script is the one-line form of the others.
This commit is contained in:
catborise 2026-10-17 22:38:33 +03:00
parent fbef55fe2d
commit 837c5468ec
13 changed files with 129 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

21
webvirtcloud/tests/test_worker_install.py
View file

@ -1,7 +1,7 @@
"""Every install type runs the worker as www-data, with its own log file and
a stop timeout above the worker's 60 s grace."""
"""Every install type runs the worker as the web server's user (www-data, or
nginx where the installer and README substitute it), with its own log file
and a stop timeout above the worker's 60 s grace."""
import re
from pathlib import Path
from django.conf import settings
@ -26,16 +26,9 @@ class WorkerInstallTestCase(SimpleTestCase):
self.assertIn("webvirtcloud-data:/srv/webvirtcloud/data", compose)
self.assertNotIn("hostname:", compose)
def test_supervisor(self):
conf = (BASE / "conf/supervisor/webvirtcloud.conf").read_text()
block = re.search(r"\[program:webvirt-worker\](.*?)(\n\[|\Z)", conf, re.S).group(1)
for text in ("manage.py run_worker", "user=www-data", "webvirtcloud-worker.log", "autorestart=true"):
self.assertIn(text, block)
self.assertRegex(block, r"stopwaitsecs=9\d")
def test_systemd_is_an_alternative(self):
def test_systemd(self):
unit = (BASE / "conf/systemd/webvirt-worker.service").read_text()
self.assertIn("run_worker", unit)
self.assertIn("Restart=on-failure", unit)
for text in ("manage.py run_worker", "User=www-data", "webvirtcloud-worker.log", "KillMode=mixed",
"EnvironmentFile=-/etc/default/webvirtcloud", "Restart=on-failure"):
self.assertIn(text, unit)
self.assertRegex(unit, r"TimeoutStopSec=9\d")
self.assertIn("one of the two", (BASE / "conf/systemd/README.md").read_text())