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

I really should test these things before I commit.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-04-19 04:36:26 +00:00
parent 54cdfdba6a
commit e63dbb09bf
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/supybot
View File

@ -139,6 +139,9 @@ if __name__ == '__main__':
'as root. You don\'t want this. Don\'t do it. '
'Even if you think you want it, you don\'t. '
'You\'re probably dumb if you do this.')
parser.add_option('', '--debug', action='store_true', dest='debug',
help='Determines whether some extra debugging stuff will'
'be logged in this script.')
(options, args) = parser.parse_args()
@ -335,6 +338,12 @@ if __name__ == '__main__':
irc.addCallback(callback)
driver = drivers.newDriver(server, irc)
if options.debug:
for (name, module) in sys.modules.iteritems():
if hasattr(module, '__file__') and hasattr(module, '__revision__'):
if module.__file__.startswith(supybot.installDir):
print '%s: %s' % (name, module.__revision__.split()[2])
if options.profile:
import hotshot
profiler = hotshot.Profile('%s-%i.prof' % (nick, time.time()))

2
src/socketDrivers.py
View File

@ -142,7 +142,7 @@ class SocketDriver(drivers.IrcDriver):
self.conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
# We allow more time for the connect here, since it might take longer.
# At least 10 seconds.
self.conn.settimeout(map(10, conf.supybot.drivers.poll()*10))
self.conn.settimeout(max(10, conf.supybot.drivers.poll()*10))
if self.reconnectWaitsIndex < len(self.reconnectWaits)-1:
self.reconnectWaitsIndex += 1
try: