saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix the channel to fail after the timeout and tries

Browse source
This commit is contained in:
Thomas S Hatch 2014-06-17 16:22:10 -06:00
parent 6c66ae536d
commit 874c0f6eec
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/transport/__init__.py
View file

@ -93,12 +93,19 @@ class RAETChannel(Channel):
'''
msg = {'route': self.route, 'load': load}
self.stack.transmit(msg, self.stack.uids['yard0'])
tried = 1
start = time.time()
while True:
time.sleep(0.01)
self.stack.serviceAll()
if self.stack.rxMsgs:
for msg in self.stack.rxMsgs:
return msg.get('return', {})
if time.time() - start > timeout:
if tried >= tries:
raise ValueError
self.stack.transmit(msg, self.stack.uids['yard0'])
tried += 1
class ZeroMQChannel(Channel):