mirror of https://github.com/Mikaela/Limnoria.git
Removed some catching of exceptions that can never happen due to MetaFirewall.
This commit is contained in:
parent
2dab520e66
commit
f3c481d13f
|
@ -101,15 +101,11 @@ class AsyncoreDriver(asynchat.async_chat, object):
|
|||
msg = ircmsgs.IrcMsg(self.buffer)
|
||||
#log.debug('Time to parse IrcMsg: %s', time.time()-start)
|
||||
self.buffer = ''
|
||||
try:
|
||||
self.irc.feedMsg(msg)
|
||||
except:
|
||||
log.exception('Uncaught exception outside Irc object:')
|
||||
|
||||
def handle_close(self):
|
||||
self.scheduleReconnect()
|
||||
self.die()
|
||||
|
||||
reconnect = handle_close
|
||||
|
||||
def handle_connect(self):
|
||||
|
|
|
@ -113,10 +113,7 @@ class SocketDriver(drivers.IrcDriver):
|
|||
start = time.time()
|
||||
msg = ircmsgs.IrcMsg(line)
|
||||
#log.debug('Time to parse IrcMsg: %s', time.time()-start)
|
||||
try:
|
||||
self.irc.feedMsg(msg)
|
||||
except:
|
||||
log.exception('Uncaught exception outside Irc object:')
|
||||
except socket.timeout:
|
||||
pass
|
||||
except socket.error, e:
|
||||
|
@ -164,6 +161,7 @@ class SocketDriver(drivers.IrcDriver):
|
|||
self.reconnectWaitPeriodsIndex = 0
|
||||
|
||||
def _checkAndWriteOrReconnect(self):
|
||||
log.debug('Checking whether we are connected.')
|
||||
(_, w, _) = select.select([], [self.conn], [], 0)
|
||||
if w:
|
||||
log.info('Socket is writable, it might be connected.')
|
||||
|
|
Loading…
Reference in New Issue