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 #35411 from eliasp/2016.3-modules.event-handle-file_client-opt

Browse source 
modules.event.send(): Prevent backtrace for masterless Minions
This commit is contained in:
Mike Place 2016-08-12 21:29:01 +09:00 • committed by GitHub
commit 4dc776ffbf
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/modules/event.py
View file

@ -39,7 +39,7 @@ def fire_master(data, tag, preload=None):
salt '*' event.fire_master '{"data":"my event data"}' 'tag'
'''
if __opts__.get('local', None):
if (__opts__.get('local', None) or __opts__.get('file_client', None) == 'local') and not __opts__.get('use_master_when_local', False):
# We can't send an event if we're in masterless mode
log.warning('Local mode detected. Event with tag {0} will NOT be sent.'.format(tag))
return False