Skip to content

Commit eefe50a

Browse files
Merge pull request #217 from dehort/add_timeout_for_waiting_on_hi_response
Add a timeout for waiting on the HI response from the peer node. Reviewed-by: https://github.com/apps/ansible-zuul
2 parents 1aa31a2 + 680f1ed commit eefe50a

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

receptor/connection/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ async def drain_buf(self, item):
142142

143143
async def _wait_handshake(self):
144144
logger.debug("waiting for HI")
145-
response = await self.buf.get() # TODO: deal with timeout
145+
response = await self.buf.get(timeout=20.0)
146146
self.remote_id = response.header["id"]
147147
await self.register()
148148
await self.receptor.recalculate_and_send_routes_soon()

receptor/messages/framed.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ async def finish(self):
287287
self.to_read = 0
288288
self.bb = FileBackedBuffer.from_temp()
289289

290-
async def get(self):
291-
return await self.q.get()
290+
async def get(self, timeout=None):
291+
return await asyncio.wait_for(self.q.get(), timeout)
292292

293293
def get_nowait(self):
294294
return self.q.get_nowait()

0 commit comments

Comments
 (0)