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

Merge branch 'master' of git.fakecake.org:tt-rss

This commit is contained in:
Andrew Dolgov 2020-10-20 15:00:10 +03:00
parent 236013b7b9 f1fd5e8db1
commit 8d75a542cd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/rssutils.php
View File

@ -187,11 +187,11 @@ class RSSUtils {
// -1 can be caused by a SIGCHLD handler which daemon master process installs (not every setup, apparently)
if ($exit_code != 0 && $exit_code != -1) {
$esth = $pdo->prepare("SELECT last_error FROM ttrss_feeds WHERE id = ?");
$esth->execute([$tline["id"]]);
$festh = $pdo->prepare("SELECT last_error FROM ttrss_feeds WHERE id = ?");
$festh->execute([$tline["id"]]);
if ($erow = $esth->fetch()) {
$error_message = $erow["last_error"];
if ($ferow = $festh->fetch()) {
$error_message = $ferow["last_error"];
} else {
$error_message = "N/A";
}
@ -201,6 +201,13 @@ class RSSUtils {
Logger::get()->log(E_USER_NOTICE,
sprintf("Update process for feed %d (%s, owner UID: %d) failed with exit code: %d (%s).",
$tline["id"], clean($tline["title"]), $tline["owner_uid"], $exit_code, clean($error_message)));
$combined_error_message = sprintf("Update process failed with exit code: %d (%s)",
$exit_code, clean($error_message));
# mark failed feed as having an update error (unless it is already marked)
$fusth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ? WHERE id = ? AND last_error = ''");
$fusth->execute([$combined_error_message, $tline["id"]]);
}
} else {