valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Dolgov 2020-09-27 16:42:42 +03:00
parent 0761533d0a
commit d4d0e976dc
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/rssutils.php
View File

@ -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;
}

7
update.php
View File

@ -260,12 +260,17 @@
if (isset($options["update-feed"])) {
try {
RSSUtils::update_rss_feed($options["update-feed"], true);
if (!RSSUtils::update_rss_feed($options["update-feed"], true))
exit(100);
} catch (PDOException $e) {
Debug::log(sprintf("Exception while updating feed %d: %s (%s:%d)",
$options["update-feed"], $e->getMessage(), $e->getFile(), $e->getLine()));
Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
exit(110);
}
}