valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25951 from garethgreenaway/event_fire_failed_log_why

Browse Source 
Log when event.fire and event.fire_master fail.
This commit is contained in:
Justin Findlay 2015-08-02 18:19:45 -06:00
commit dcc6883b24
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/event.py
View File

@ -6,7 +6,10 @@ master to the minion and vice-versa.
from __future__ import absolute_import
# Import Python libs
import collections
import logging
import os
import sys
import traceback
# Import salt libs
import salt.crypt
@ -16,6 +19,7 @@ import salt.transport
import salt.ext.six as six
__proxyenabled__ = ['*']
log = logging.getLogger(__name__)
def _dict_subset(keys, master_dict):
@ -71,6 +75,9 @@ def fire_master(data, tag, preload=None):
return salt.utils.event.MinionEvent(__opts__).fire_event(
{'data': data, 'tag': tag, 'events': None, 'pretag': None}, 'fire_master')
except Exception:
exc_type, exc_value, exc_traceback = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
log.debug(lines)
return False
@ -93,6 +100,9 @@ def fire(data, tag):
return event.fire_event(data, tag)
except Exception:
exc_type, exc_value, exc_traceback = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_traceback)
log.debug(lines)
return False