aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGravatar jesopo2019-06-27 16:00:14 +0100
committerGravatar jesopo2019-06-27 16:00:14 +0100
commit14b7a8ae1108033cab0bf4f62b3729f753d38e75 (patch)
tree055c77a5109c3708fd1f63a3427faebf6addc3d8 /modules
parentget rss feed xml ourselves so feedparser.parse can't hang on us (diff)
signature
exc_info need to be in an `except` block
Diffstat (limited to 'modules')
-rw-r--r--modules/rss.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/rss.py b/modules/rss.py
index ad94ad59..28ba84c7 100644
--- a/modules/rss.py
+++ b/modules/rss.py
@@ -38,13 +38,11 @@ class Module(ModuleManager.BaseModule):
try:
data = utils.http.request(url)
feed = feedparser.parse(data.data)
+ feed["feed"] or ValueError("Feed info empty")
except:
- feed = None
-
- if not feed or not feed["feed"]:
- self.log.warn("Failed to parse rss for %s", [url],
+ self.log.warn("Failed to GET RSS for %s", [url],
exc_info=True)
- continue
+ return
feed_title = feed["feed"]["title"]
entry_formatted = {}