Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-03-29 19:06:49 +01:00
Code Issues Projects Releases Wiki Activity

Removed some catching of exceptions that can never happen due to MetaFirewall.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-02-17 06:31:19 +00:00
parent 2dab520e66
commit f3c481d13f
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/asyncoreDrivers.py
View File

@ -101,15 +101,11 @@ class AsyncoreDriver(asynchat.async_chat, object):
msg = ircmsgs.IrcMsg(self.buffer) msg = ircmsgs.IrcMsg(self.buffer)
#log.debug('Time to parse IrcMsg: %s', time.time()-start) #log.debug('Time to parse IrcMsg: %s', time.time()-start)
self.buffer = '' self.buffer = ''
try: self.irc.feedMsg(msg)
self.irc.feedMsg(msg)
except:
log.exception('Uncaught exception outside Irc object:')
def handle_close(self): def handle_close(self):
self.scheduleReconnect() self.scheduleReconnect()
self.die() self.die()
reconnect = handle_close reconnect = handle_close
def handle_connect(self): def handle_connect(self):

6
src/socketDrivers.py
View File

@ -113,10 +113,7 @@ class SocketDriver(drivers.IrcDriver):
start = time.time() start = time.time()
msg = ircmsgs.IrcMsg(line) msg = ircmsgs.IrcMsg(line)
#log.debug('Time to parse IrcMsg: %s', time.time()-start) #log.debug('Time to parse IrcMsg: %s', time.time()-start)
try: self.irc.feedMsg(msg)
self.irc.feedMsg(msg)
except:
log.exception('Uncaught exception outside Irc object:')
except socket.timeout: except socket.timeout:
pass pass
except socket.error, e: except socket.error, e:
@ -164,6 +161,7 @@ class SocketDriver(drivers.IrcDriver):
self.reconnectWaitPeriodsIndex = 0 self.reconnectWaitPeriodsIndex = 0
def _checkAndWriteOrReconnect(self): def _checkAndWriteOrReconnect(self):
log.debug('Checking whether we are connected.')
(_, w, _) = select.select([], [self.conn], [], 0) (_, w, _) = select.select([], [self.conn], [], 0)
if w: if w:
log.info('Socket is writable, it might be connected.') log.info('Socket is writable, it might be connected.')