Added supybot.defaultSocketTimeout as a configurable.

This commit is contained in:
Jeremy Fincher 2004-02-07 11:12:12 +00:00
parent a0d830c061
commit b51961b18a
2 changed files with 16 additions and 8 deletions

View File

@ -35,6 +35,7 @@ import fix
import os import os
import sys import sys
import socket
import string import string
import utils import utils
@ -334,11 +335,6 @@ whether the bot will automatically thread all commands. At this point this
option exists almost exclusively for debugging purposes; it can do very little option exists almost exclusively for debugging purposes; it can do very little
except to take up more CPU.""")) except to take up more CPU."""))
supybot.register('httpPeekSize', registry.PositiveInteger(4096, """Determines
how many bytes the bot will 'peek' at when looking through a URL for a
doctype or title or something similar. It'll give up after it reads this many
bytes."""))
supybot.register('pingServer', registry.Boolean(True, """Determines whether supybot.register('pingServer', registry.Boolean(True, """Determines whether
the bot will send PINGs to the server it's connected to in order to keep the the bot will send PINGs to the server it's connected to in order to keep the
connection alive and discover earlier when it breaks. Really, this option connection alive and discover earlier when it breaks. Really, this option
@ -357,6 +353,21 @@ over your modifications. Do note that if you change this to False inside the
bot, your changes won't be flushed. To make this change permanent, you must bot, your changes won't be flushed. To make this change permanent, you must
edit the registry yourself.""")) edit the registry yourself."""))
supybot.register('httpPeekSize', registry.PositiveInteger(4096, """Determines
how many bytes the bot will 'peek' at when looking through a URL for a
doctype or title or something similar. It'll give up after it reads this many
bytes."""))
class SocketTimeout(registry.PositiveInteger):
def setValue(self, v):
registry.PositiveInteger.setValue(self, v)
socket.setdefaulttimeout(self.value)
supybot.register('defaultSocketTimeout', SocketTimeout(10, """Determines what
the default timeout for socket objects will be. This means that *all* sockets
will timeout when this many seconds has gone by (unless otherwise modified by
the author of the code that uses the sockets).""")
### ###
# Driver stuff. # Driver stuff.
### ###

View File

@ -44,7 +44,6 @@ import sre
import time import time
import types import types
import atexit import atexit
import socket
import threading import threading
import log import log
@ -52,8 +51,6 @@ import conf
import drivers import drivers
import ircutils import ircutils
socket.setdefaulttimeout(10)
startedAt = time.time() # Just in case it doesn't get set later. startedAt = time.time() # Just in case it doesn't get set later.
mainThread = threading.currentThread() mainThread = threading.currentThread()