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

tweaked connectTCP call slightly to reduce possibility of 'connecting' state limbo

Browse Source
This commit is contained in:
Thom Nichols 2010-06-03 15:21:26 -04:00
parent f54501a346
commit 919c8c5633
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sleekxmpp/xmlstream/xmlstream.py
View File

@ -100,18 +100,20 @@ class XMLStream(object):
self.filesocket = filesocket self.filesocket = filesocket
def connect(self, host='', port=0, use_ssl=None, use_tls=None): def connect(self, host='', port=0, use_ssl=None, use_tls=None):
"Link to connectTCP" "Establish a socket connection to the given XMPP server."
if not self.state.transition('disconnected','connecting'): if not self.state.transition('disconnected','connecting'):
logging.warning("Can't connect now; Already in state %s", self.state.current_state()) logging.warning("Can't connect now; Already in state %s", self.state.current_state())
return False return False
if not self.connectTCP(host, port, use_ssl, use_tls): try:
# return to the 'disconnected' state if connect failed: return self.connectTCP(host, port, use_ssl, use_tls)
# otherwise the connect method is not reentrant finally:
if not self.state.transition('connecting','disconnected'): # attempt to ensure once a connection attempt starts, we leave either in the
logging.error("Couldn't transition to the 'disconnected' state!") # 'connected' or 'disconnected' state. Otherwise the connect method is not reentrant
return False if self.state['connecting']:
return True if not self.state.transition('connecting','disconnected'):
logging.error("Couldn't return to the 'disconnected' state after connection failure!")
# TODO currently a caller can't distinguish between "connection failed" and # TODO currently a caller can't distinguish between "connection failed" and
# "we're already trying to connect from another thread" # "we're already trying to connect from another thread"
@ -285,7 +287,8 @@ class XMLStream(object):
logging.debug("SEND: %s" % data) logging.debug("SEND: %s" % data)
self.socket.sendall(data.encode('utf-8')) self.socket.sendall(data.encode('utf-8'))
except queue.Empty: except queue.Empty:
logging.debug('nothing on send queue') # logging.debug('Nothing on send queue')
pass
except socket.timeout: except socket.timeout:
# this is to prevent a thread blocked indefinitely # this is to prevent a thread blocked indefinitely
logging.debug('timeout sending packet data') logging.debug('timeout sending packet data')
@ -372,7 +375,7 @@ class XMLStream(object):
try: try:
event = self.eventqueue.get(True, timeout=5) event = self.eventqueue.get(True, timeout=5)
except queue.Empty: except queue.Empty:
logging.debug('Nothing on event queue') # logging.debug('Nothing on event queue')
event = None event = None
if event is not None: if event is not None:
etype = event[0] etype = event[0]