From db3e67b3fe94f3752b6ff5af61703d1b60b5fcb5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 18 Jun 2024 21:47:05 +0300 Subject: * pass arbitrary CLI arguments to update daemon via updater.sh entrypoint * add configurable log level for update daemon (DAEMON_LOG_LEVEL) * when daemon log level is set to LOG_EXTENDED (2) log queries for feed update selection --- update_daemon2.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'update_daemon2.php') diff --git a/update_daemon2.php b/update_daemon2.php index 27b066db0..4d80bed0a 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -133,7 +133,7 @@ print "Tiny Tiny RSS update daemon.\n\n"; print "Options:\n"; print " --log FILE - log messages to FILE\n"; - print " --log-level N - log verbosity level\n"; + print " --log-level N - log verbosity level\n"; print " --tasks N - amount of update tasks to spawn\n"; print " default: " . Config::get(Config::DAEMON_MAX_JOBS) . "\n"; print " --interval N - task spawn interval\n"; @@ -144,9 +144,13 @@ Debug::set_enabled(true); + $log_level = Debug::map_loglevel(Config::get(Config::DAEMON_LOG_LEVEL)); + if (isset($options["log-level"])) { - Debug::set_loglevel(Debug::map_loglevel((int)$options["log-level"])); - } + $log_level = Debug::map_loglevel((int)$options["log-level"]); + } + + Debug::set_loglevel((int) $log_level); if (isset($options["log"])) { Debug::set_quiet(isset($options['quiet'])); @@ -246,7 +250,7 @@ $my_pid = posix_getpid(); - passthru(Config::get(Config::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 --log-level $log_level --task $j --pidlock $my_pid"); sleep(1); -- cgit v1.2.3-54-g00ecf