feeds: catch ConnectionError to avoid killing thread

[sid.git] / sid / feeds.py

diff --git a/sid/feeds.py b/sid/feeds.py
index 7fba4e25151b390d6c46370b26d28f05efbf8e24..490d89de5816b230b5f3b91dc0f2afb5ffb5c548 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -19,6 +19,8 @@ import threading
 import time
 import traceback
 
+from urllib.error import URLError
+
 from feedparser import parse as feed_parse
 
 from .plugin import Plugin, botcmd
@@ -122,7 +124,11 @@ class FeedMonitor(threading.Thread):
             for feed in self.feeds_list:
                 try:
                     self.new_posts(feed)
-                except Exception as err:
+                except ConnectionError as err:  # Non fatal exception
+                    self.plugin.log.error(f'connection error on {feed}: {err}')
+                except URLError as err:  # Non fatal exception
+                    self.plugin.log.error(f'error for {feed}: {err.reason}')
+                except Exception as err:  # Unknown execption, killing thread anyway
                     self.plugin.log.error('feeds thread crashed: %s', err)
                     self.plugin.log.error(''.join(traceback.format_exc()))
                     self.thread_killed = True
@@ -163,11 +169,9 @@ class Feeds(Plugin):
 
     @botcmd
     def feeds(self, rcv, args):
-        """feeds monitors debian project related feeds.
-
-        **commands**:
+        """Monitors debian project related feeds.
 
-        * ``!feeds`` : registred feeds list
+        * ``!feeds``      : registred feeds list
         * ``!feeds last`` : last check time"""
         if 'last' in args:
             self.reply(rcv, 'Last feeds check: %s' % self.th_mon.last_check)