diff options
Diffstat (limited to 'update_daemon2.php')
| -rwxr-xr-x | update_daemon2.php | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/update_daemon2.php b/update_daemon2.php index 5d4d3759c..2743a0fa2 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -10,14 +10,6 @@ require_once "autoload.php"; require_once "functions.php"; - require_once "config.php"; - - // defaults - if (!defined('PURGE_INTERVAL')) define('PURGE_INTERVAL', 3600); // seconds - if (!defined('MAX_CHILD_RUNTIME')) define('MAX_CHILD_RUNTIME', 1800); // seconds - if (!defined('MAX_JOBS')) define('MAX_JOBS', 2); - if (!defined('SPAWN_INTERVAL')) define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds - require_once "sanity_check.php"; require_once "db-prefs.php"; @@ -78,7 +70,7 @@ foreach (array_keys($ctimes) as $pid) { $started = $ctimes[$pid]; - if (time() - $started > MAX_CHILD_RUNTIME) { + if (time() - $started > Config::get(Config::DAEMON_MAX_CHILD_RUNTIME)) { Debug::log("Child process with PID $pid seems to be stuck, aborting..."); posix_kill($pid, SIGKILL); } @@ -98,9 +90,9 @@ function shutdown($caller_pid) { if ($caller_pid == posix_getpid()) { - if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) { + if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon.lock")) { Debug::log("Removing lockfile (master)..."); - unlink(LOCK_DIRECTORY . "/update_daemon.lock"); + unlink(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon.lock"); } } } @@ -108,9 +100,9 @@ function task_shutdown() { $pid = posix_getpid(); - if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) { + if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon-$pid.lock")) { Debug::log("Removing task lockfile for PID $pid..."); - unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock"); + unlink(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon-$pid.lock"); } } @@ -143,9 +135,9 @@ print " --log FILE - log messages to FILE\n"; print " --log-level N - log verbosity level\n"; print " --tasks N - amount of update tasks to spawn\n"; - print " default: " . MAX_JOBS . "\n"; + print " default: " . Config::get(Config::DAEMON_MAX_JOBS) . "\n"; print " --interval N - task spawn interval\n"; - print " default: " . SPAWN_INTERVAL . " seconds.\n"; + print " default: " . Config::get(Config::DAEMON_SLEEP_INTERVAL) . " seconds.\n"; print " --quiet - don't output messages to stdout\n"; return; } @@ -170,14 +162,14 @@ Debug::log("Set to spawn " . $options["tasks"] . " children."); $max_jobs = $options["tasks"]; } else { - $max_jobs = MAX_JOBS; + $max_jobs = Config::get(Config::DAEMON_MAX_JOBS); } if (isset($options["interval"])) { Debug::log("Spawn interval: " . $options["interval"] . " seconds."); $spawn_interval = $options["interval"]; } else { - $spawn_interval = SPAWN_INTERVAL; + $spawn_interval = Config::get(Config::DAEMON_SLEEP_INTERVAL); } // let's enforce a minimum spawn interval as to not forkbomb the host @@ -249,7 +241,7 @@ $my_pid = posix_getpid(); - passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid"); + passthru(Config::get(Config::PHP_EXECUTABLE) . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid"); sleep(1); |