diff --git a/src/asyncoreDrivers.py b/src/asyncoreDrivers.py index 61796d426..ed3b70116 100644 --- a/src/asyncoreDrivers.py +++ b/src/asyncoreDrivers.py @@ -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:') + self.irc.feedMsg(msg) def handle_close(self): self.scheduleReconnect() self.die() - reconnect = handle_close def handle_connect(self): diff --git a/src/socketDrivers.py b/src/socketDrivers.py index 9212987f6..dab4aeb5c 100644 --- a/src/socketDrivers.py +++ b/src/socketDrivers.py @@ -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:') + self.irc.feedMsg(msg) 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.')