valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Process events even without 'id' in them

Browse Source 
This was breaking syndic matching.  The syndic would return its list of
expected minions, but that event does not have 'id' in it.  Thus, the
master would not process that event and it would either result in huge
delays for minion returns or the returns for minions under syndics
wouldn't appear at all on the CLI.
This commit is contained in:
Colton Myers 2013-11-07 15:37:31 -07:00
parent 3b4cf81766
commit 91b03329e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/client/__init__.py
View File

@ -1030,7 +1030,7 @@ class LocalClient(object):
syndic_wait = 0 syndic_wait = 0
while True: while True:
raw = self.event.get_event(timeout, jid) raw = self.event.get_event(timeout, jid)
if raw is not None and 'id' in raw: if raw is not None:
if 'minions' in raw.get('data', {}): if 'minions' in raw.get('data', {}):
minions.update(raw['data']['minions']) minions.update(raw['data']['minions'])
continue continue