From d4d0e976dc371d6fb761d3e3713ca0f7182ebb40 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 27 Sep 2020 16:42:42 +0300 Subject: update-feed: exit with non-zero exit code if update_rss_feed() failed daemon: log if per-feed update task terminated with non-zero exit code --- classes/rssutils.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/rssutils.php b/classes/rssutils.php index d7361b2c0..114932569 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -150,7 +150,8 @@ class RSSUtils { $log = function_exists("flock") && isset($options['log']) ? '--log '.$options['log'] : ''; $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : ''; - passthru(PHP_EXECUTABLE . " update.php --update-feed " . $tline["id"] . " --pidlock feed-" . $tline["id"] . " $quiet $log $log_level"); + $exit_code = 0; + passthru(PHP_EXECUTABLE . " update.php --update-feed " . $tline["id"] . " --pidlock feed-" . $tline["id"] . " $quiet $log $log_level", $exit_code); /* try { self::update_rss_feed($tline["id"], true, false); @@ -165,7 +166,11 @@ class RSSUtils { } } */ - Debug::log(sprintf(" %.4f (sec)", microtime(true) - $fstarted)); + Debug::log(sprintf(" %.4f (sec) RC=%d", microtime(true) - $fstarted, $exit_code)); + + if ($exit_code != 0) { + Logger::get()->log(sprintf("Update process for feed %d terminated with non-zero exit code: %d", $tline["id"], $exit_code)); + } ++$nf; } -- cgit v1.2.3