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

Merge branch 'fix-reconnect-2.0' into 'master'

Browse Source 
Reset reconnect delay on manual reconnect, add delay event

See merge request poezio/slixmpp!35
This commit is contained in:
Maxime Buquet 2020-03-29 14:26:15 +02:00
commit 842aa3be8f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slixmpp/xmlstream/xmlstream.py
View File

@ -277,6 +277,7 @@ class XMLStream(asyncio.BaseProtocol):
) )
self.disconnect_reason = None self.disconnect_reason = None
self.cancel_connection_attempt() self.cancel_connection_attempt()
self.connect_loop_wait = 0
if host and port: if host and port:
self.address = (host, int(port)) self.address = (host, int(port))
try: try:
@ -301,6 +302,10 @@ class XMLStream(asyncio.BaseProtocol):
async def _connect_routine(self): async def _connect_routine(self):
self.event_when_connected = "connected" self.event_when_connected = "connected"
if self.connect_loop_wait > 0:
self.event('reconnect_delay', self.connect_loop_wait)
await asyncio.sleep(self.connect_loop_wait, loop=self.loop)
record = await self.pick_dns_answer(self.default_domain) record = await self.pick_dns_answer(self.default_domain)
if record is not None: if record is not None:
host, address, dns_port = record host, address, dns_port = record
@ -317,7 +322,6 @@ class XMLStream(asyncio.BaseProtocol):
else: else:
ssl_context = None ssl_context = None
await asyncio.sleep(self.connect_loop_wait, loop=self.loop)
if self._current_connection_attempt is None: if self._current_connection_attempt is None:
return return
try: try: