Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 12:42:34 +01:00
Code Issues Projects Releases Wiki Activity

Let's catch some socket.timeout action.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-08-04 06:19:31 +00:00
parent 89c3737648
commit 68516b8fec
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/RSS.py
View File

@ -206,6 +206,8 @@ class RSS(callbacks.Privmsg):
self.locks[url].release()
def getFeed(self, url):
def error(s):
return {'items': [{'title': s}]}
try:
# This is the most obvious place to acquire the lock, because a
# malicious user could conceivably flood the bot with rss commands
@ -218,13 +220,15 @@ class RSS(callbacks.Privmsg):
except sgmllib.SGMLParseError:
self.log.exception('Uncaught exception from rssparser:')
raise callbacks.Error, 'Invalid (unparseable) RSS feed.'
except socket.timeout:
return error('Timeout downloading feed.')
self.cachedFeeds[url] = results
self.lastRequest[url] = time.time()
try:
return self.cachedFeeds[url]
except KeyError:
self.lastRequest[url] = 0
return {'items': [{'title': 'Unable to download feed.'}]}
return error('Unable to download feed.')
finally:
self.releaseLock(url)