cuqmbr/rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-04-05 17:19:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(FeedMerge): allow xml parse failure too (#3518)

Browse Source
This commit is contained in:
Dag 2023-07-08 23:36:36 +02:00 committed by GitHub
parent 7881c87bed
commit f0a504bb9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/FeedMergeBridge.php
View File

@ -63,12 +63,20 @@ TEXT;
try { try {
$this->collectExpandableDatas($feed); $this->collectExpandableDatas($feed);
} catch (HttpException $e) { } catch (HttpException $e) {
Logger::warning(sprintf('Exception in FeedMergeBridge: %s', create_sane_exception_message($e)));
$this->items[] = [ $this->items[] = [
'title' => 'RSS-Bridge: ' . $e->getMessage(), 'title' => 'RSS-Bridge: ' . $e->getMessage(),
// Give current time so it sorts to the top // Give current time so it sorts to the top
'timestamp' => time(), 'timestamp' => time(),
]; ];
continue; continue;
} catch (\Exception $e) {
if (str_starts_with($e->getMessage(), 'Unable to parse xml')) {
// Allow this particular exception from FeedExpander
Logger::warning(sprintf('Exception in FeedMergeBridge: %s', create_sane_exception_message($e)));
continue;
}
throw $e;
} }
} else { } else {
$this->collectExpandableDatas($feed); $this->collectExpandableDatas($feed);