github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-12-25 11:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify the main process loop.

Browse source
This commit is contained in:
Lance Stout 2011-08-25 17:08:20 -07:00
parent 802dd8393d
commit e3e985220e
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sleekxmpp/test/sleektest.py
View file

@ -336,7 +336,6 @@ class SleekTest(unittest.TestCase):
# Simulate connecting for mock sockets. # Simulate connecting for mock sockets.
self.xmpp.auto_reconnect = False self.xmpp.auto_reconnect = False
self.xmpp.is_client = True
self.xmpp.state._set_state('connected') self.xmpp.state._set_state('connected')
# Must have the stream header ready for xmpp.process() to work. # Must have the stream header ready for xmpp.process() to work.

32
sleekxmpp/xmlstream/xmlstream.py
View file

@ -235,7 +235,6 @@ class XMLStream(object):
self._id_lock = threading.Lock() self._id_lock = threading.Lock()
self.auto_reconnect = True self.auto_reconnect = True
self.is_client = False
self.dns_answers = [] self.dns_answers = []
self.add_event_handler('connected', self._handle_connected) self.add_event_handler('connected', self._handle_connected)
@ -328,7 +327,6 @@ class XMLStream(object):
except Socket.error: except Socket.error:
self.default_domain = self.address[0] self.default_domain = self.address[0]
self.is_client = True
# Respect previous SSL and TLS usage directives. # Respect previous SSL and TLS usage directives.
if use_ssl is not None: if use_ssl is not None:
self.use_ssl = use_ssl self.use_ssl = use_ssl
@ -1038,44 +1036,48 @@ class XMLStream(object):
Processing will continue after any recoverable errors Processing will continue after any recoverable errors
if reconnections are allowed. if reconnections are allowed.
""" """
firstrun = True
# The body of this loop will only execute once per connection. # The body of this loop will only execute once per connection.
# Additional passes will be made only if an error occurs and # Additional passes will be made only if an error occurs and
# reconnecting is permitted. # reconnecting is permitted.
while firstrun or (self.auto_reconnect and not self.stop.isSet()): while True:
firstrun = False
try: try:
if self.is_client:
self.send_raw(self.stream_header, now=True)
# The call to self.__read_xml will block and prevent # The call to self.__read_xml will block and prevent
# the body of the loop from running until a disconnect # the body of the loop from running until a disconnect
# occurs. After any reconnection, the stream header will # occurs. After any reconnection, the stream header will
# be resent and processing will resume. # be resent and processing will resume.
while not self.stop.isSet() and self.__read_xml(): while not self.stop.is_set():
# Only process the stream while connected to the server
if not self.state.ensure('connected', wait=0.1,
block_on_transition=True):
continue
# Ensure the stream header is sent for any # Ensure the stream header is sent for any
# new connections. # new connections.
if self.is_client: if not self.session_started_event.is_set():
self.send_raw(self.stream_header, now=True) self.send_raw(self.stream_header, now=True)
self.__read_xml()
except KeyboardInterrupt: except KeyboardInterrupt:
log.debug("Keyboard Escape Detected in _process") log.debug("Keyboard Escape Detected in _process")
self.stop.set() self.stop.set()
except SystemExit: except SystemExit:
log.debug("SystemExit in _process") log.debug("SystemExit in _process")
self.stop.set() self.stop.set()
self.scheduler.quit()
except Socket.error as serr: except Socket.error as serr:
self.event('socket_error', serr) self.event('socket_error', serr)
log.exception('Socket Error') log.exception('Socket Error')
except: except:
if not self.stop.isSet(): if not self.stop.is_set():
log.exception('Connection error.') log.exception('Connection error.')
if not self.stop.isSet() and self.auto_reconnect:
self.reconnect() if not self.stop.is_set():
if self.auto_reconnect:
self.reconnect()
else:
continue
else: else:
self.event('killed', direct=True)
self.disconnect() self.disconnect()
self.event_queue.put(('quit', None, None)) break
self.scheduler.run = False
def __read_xml(self): def __read_xml(self):
""" """