Merge lp:~stefanor/ibid/reconnect-396634 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Stefano Rivera (stefanor)]

I think this will fix the multiple-personality-syndrome that Ibid sometimes gets.

My guess is that when it excepts during "disconnect from" it doesn't clean up properly.

Thus when you reconnect, you now have a reconnecting factory that's still trying to connect in the background.

Howover, my twisted-fu isn't very strong. Is this right?

[Michael Gorven (mgorven)]

This doesn't really make sense to me. All this seems to achieve is to prevent
an exception if the factory doesn't have a proto instance, but if this is the
case it surely can't be connected or even trying to connect? So the only time
this should happen is if it is fully disconnected.

[Stefano Rivera (stefanor)]

OK, this one should make sense :)

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/source/dc.py'
--- ibid/source/dc.py	2009-05-02 14:51:09 +0000
+++ ibid/source/dc.py	2009-07-08 09:34:09 +0000
@@ -177,7 +177,8 @@
     def disconnect(self):
         self.stopTrying()
         self.stopFactory()
-        self.proto.transport.loseConnection()
+        if hasattr(self, 'proto'):
+            self.proto.transport.loseConnection()
         return True
 
     def _dc_auth_callback(self, nick, result):

=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py	2009-07-04 11:49:45 +0000
+++ ibid/source/irc.py	2009-07-08 09:34:09 +0000
@@ -226,7 +226,8 @@
     def disconnect(self):
         self.stopTrying()
         self.stopFactory()
-        self.proto.transport.loseConnection()
+        if hasattr(self, 'proto'):
+            self.proto.transport.loseConnection()
         return True
 
     def join(self, channel):