Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-30 06:49:24 +01:00
Code Issues Projects Releases Wiki Activity

Tried (again) to fix bug #1156765. This might resurrect some old bugs, such as the inability to quit via Ctrl-C or similar. It must be tested.

Browse Source
This commit is contained in:
Jeremy Fincher 2005-05-20 16:29:17 +00:00
parent 5e07947f74
commit ff2eb7daa9
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drivers/Twisted.py
View File

@ -27,8 +27,6 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
### ###
import time import time
import supybot.log as log import supybot.log as log
@ -84,7 +82,7 @@ class SupyIrcProtocol(LineReceiver):
else: else:
drivers.log.disconnect(self.factory.currentServer, errorMsg(r)) drivers.log.disconnect(self.factory.currentServer, errorMsg(r))
if self.irc.zombie: if self.irc.zombie:
self.factory.continueTrying = False self.factory.stopTrying()
while self.irc.takeMsg(): while self.irc.takeMsg():
continue continue
else: else:
@ -96,7 +94,7 @@ class SupyIrcProtocol(LineReceiver):
def die(self): def die(self):
drivers.log.die(self.irc) drivers.log.die(self.irc)
self.factory.continueTrying = False self.factory.stopTrying()
self.transport.loseConnection() self.transport.loseConnection()
def reconnect(self, wait=None): def reconnect(self, wait=None):
@ -136,8 +134,7 @@ class SupyReconnectingFactory(ReconnectingClientFactory, drivers.ServersMixin):
def clientConnectionFailed(self, connector, r): def clientConnectionFailed(self, connector, r):
drivers.log.connectError(self.currentServer, errorMsg(r)) drivers.log.connectError(self.currentServer, errorMsg(r))
(connector.host, connector.port) = self._getNextServer() (connector.host, connector.port) = self._getNextServer()
if not r.check(error.TimeoutError): ReconnectingClientFactory.clientConnectionFailed(self, connector,r)
ReconnectingClientFactory.clientConnectionFailed(self, connector,r)
def clientConnectionLost(self, connector, r): def clientConnectionLost(self, connector, r):
(connector.host, connector.port) = self._getNextServer() (connector.host, connector.port) = self._getNextServer()