Update support for daemon pidfile config

diff --git a/bin/daemon.php b/bin/daemon.php
index 2450e4223e5877532db6eedd8aef09d578220ea7..2813100267dfd3cc26c1ab3ce43f406b6a20b108 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -34,11 +34,14 @@ if ($a->mode === App::MODE_INSTALL) {
 
 Config::load();
 
-if (!isset($pidfile)) {
-       die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n".
-               '$pidfile = "/path/to/daemon.pid";'."\n");
+if (empty(Config::get('system', 'pidfile'))) {
+       die('Please set system.pidfile in config/local.ini.php. For example:'."\n".
+               '[system]'."\n".
+               'pidfile = /path/to/daemon.pid'."\n");
 }
 
+$pidfile = Config::get('system', 'pidfile');
+
 if (in_array("start", $_SERVER["argv"])) {
        $mode = "start";
 }