1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-22 21:22:40 +00:00

Load configuration after forking

This commit is contained in:
J. King 2021-06-06 16:38:11 -04:00
parent 29b83b4453
commit 410310282f

View file

@ -81,7 +81,7 @@ USAGE_TEXT;
try { try {
$cmd = $this->command($args); $cmd = $this->command($args);
if ($cmd && !in_array($cmd, ["", "conf save-defaults", "daemon"])) { if ($cmd && !in_array($cmd, ["", "conf save-defaults", "daemon"])) {
// only certain commands don't require configuration to be loaded // only certain commands don't require configuration to be loaded; daemon loads configuration after forking (if applicable)
$this->loadConf(); $this->loadConf();
} }
switch ($cmd) { switch ($cmd) {
@ -96,6 +96,7 @@ USAGE_TEXT;
if ($args['--fork'] !== null) { if ($args['--fork'] !== null) {
$this->fork($args['--fork']); $this->fork($args['--fork']);
} }
$this->loadConf();
Arsse::$obj->get(Service::class)->watch(true); Arsse::$obj->get(Service::class)->watch(true);
return 0; return 0;
case "feed refresh": case "feed refresh":