Merge pull request #21 from tomwilkie/master

Fix some problems calling disconnect before exiting application.

Author: ekulyk

pusherclient/connection.py

@@ -19,6 +19,7 @@ def __init__(self, event_handler, url, log_level=logging.INFO, daemon=True, reco
 
         self.event_callbacks = {}
 
+        self.disconnect_called = False
         self.needs_reconnect = False
         self.default_reconnect_interval = reconnect_interval
         self.reconnect_interval = reconnect_interval
@@ -74,8 +75,10 @@ def bind(self, event_name, callback):
 
     def disconnect(self):
         self.needs_reconnect = False
+        self.disconnect_called = True
         if self.socket:
             self.socket.close()
+        self.join()
 
     def reconnect(self, reconnect_interval=None):
         if reconnect_interval is None:
@@ -104,7 +107,7 @@ def _connect(self):
 
         self.socket.run_forever()
 
-        while self.needs_reconnect:
+        while self.needs_reconnect and not self.disconnect_called:
             self.logger.info("Attempting to connect again in %s seconds."
                              % self.reconnect_interval)
             self.state = "unavailable"