Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Web: add 'timeout' config for web fetch, default 5 sec.

Browse Source 
Otherwise, when a site would take a long time to respond, the thread would hang for quite a while.

also needed to mod src/utils/web.py to take the timeout arg.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
This commit is contained in:
Daniel Folkinshteyn 2011-06-13 16:42:57 -04:00 committed by James McCoy
parent ce9891368b
commit f310350335
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/Web/config.py
View File

@ -58,4 +58,9 @@ conf.registerGlobalValue(Web.fetch, 'maximum',
registry.NonNegativeInteger(0, """Determines the maximum number of registry.NonNegativeInteger(0, """Determines the maximum number of
bytes the bot will download via the 'fetch' command in this plugin.""")) bytes the bot will download via the 'fetch' command in this plugin."""))
conf.registerGlobalValue(Web.fetch, 'timeout',
registry.NonNegativeInteger(5, """Determines the maximum number of
seconds the bot will wait for the site to respond, when using the 'fetch'
command in this plugin. If 0, will use socket.defaulttimeout"""))
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

5
plugins/Web/plugin.py
View File

@ -236,7 +236,10 @@ class Web(callbacks.PluginRegexp):
irc.error('This command is disabled ' irc.error('This command is disabled '
'(supybot.plugins.Web.fetch.maximum is set to 0).', '(supybot.plugins.Web.fetch.maximum is set to 0).',
Raise=True) Raise=True)
fd = utils.web.getUrlFd(url) timeout = self.registryValue('fetch.timeout')
if timeout == 0:
timeout = None
fd = utils.web.getUrlFd(url, timeout=timeout)
irc.reply(fd.read(max)) irc.reply(fd.read(max))
fetch = wrap(fetch, ['url']) fetch = wrap(fetch, ['url'])

4
src/utils/web.py
View File

@ -96,7 +96,7 @@ defaultHeaders = {
# application-specific function. Feel free to use a callable here. # application-specific function. Feel free to use a callable here.
proxy = None proxy = None
def getUrlFd(url, headers=None, data=None): def getUrlFd(url, headers=None, data=None, timeout=None):
"""getUrlFd(url, headers=None, data=None) """getUrlFd(url, headers=None, data=None)
Opens the given url and returns a file object. Headers and data are Opens the given url and returns a file object. Headers and data are
@ -114,7 +114,7 @@ def getUrlFd(url, headers=None, data=None):
httpProxy = force(proxy) httpProxy = force(proxy)
if httpProxy: if httpProxy:
request.set_proxy(httpProxy, 'http') request.set_proxy(httpProxy, 'http')
fd = urllib2.urlopen(request) fd = urllib2.urlopen(request, timeout=timeout)
return fd return fd
except socket.timeout, e: except socket.timeout, e:
raise Error, TIMED_OUT raise Error, TIMED_OUT