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

Merge pull request #24607 from garethgreenaway/2015_5_sending_events_multi_master

Browse source 
fixes to minion.py
This commit is contained in:
Mike Place 2015-06-17 12:16:42 -06:00
commit 9995f64428
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/minion.py
View file

@ -631,9 +631,12 @@ class MultiMinion(MinionBase):
if package:
try:
for master in masters:
minions[master].handle_event(package)
if 'minion' in minions[master]:
minions[master]['minion'].handle_event(package)
except Exception:
pass
exc_type, exc_value, exc_traceback = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
log.debug(lines)
finally:
package = None