jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout
2012-09-18 10:37:04 -07:00
parent 67147570e9 c2ae1ee891
commit d385b9e708
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sleekxmpp/xmlstream/xmlstream.py
View File

@@ -420,6 +420,8 @@ class XMLStream(object):
:param reattempt: Flag indicating if the socket should reconnect :param reattempt: Flag indicating if the socket should reconnect
after disconnections. after disconnections.
""" """
self.stop.clear()
if host and port: if host and port:
self.address = (host, int(port)) self.address = (host, int(port))
try: try:
@@ -452,7 +454,6 @@ class XMLStream(object):
def _connect(self, reattempt=True): def _connect(self, reattempt=True):
self.scheduler.remove('Session timeout check') self.scheduler.remove('Session timeout check')
self.stop.clear()
if self.reconnect_delay is None or not reattempt: if self.reconnect_delay is None or not reattempt:
delay = 1.0 delay = 1.0