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

work on event logging

Browse source 
- don't log event data on returner not found
- only log event data if log_level is debug or lower
This commit is contained in:
Andreas Lutro 2016-03-11 14:15:28 +01:00 • committed by Andreas Lutro
parent 7fb2331ebc
commit 83fa136da7
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/utils/event.py
View file

@ -975,16 +975,17 @@ class EventReturn(multiprocessing.Process):
try:
self.minion.returners[event_return](self.event_queue)
except Exception as exc:
log.error('Could not store events {0}. '
'Returner raised exception: {1}'.format(
self.event_queue, exc))
log.error('Could not store events - returner \'{0}\' raised '
'exception: {1}'.format(self.opts['event_return'], exc))
# don't waste processing power unnecessarily on converting a
# potentially huge dataset to a string
if log.level <= logging.DEBUG:
log.debug('Event data that caused an exception: {0}'.format(
self.event_queue))
del self.event_queue[:]
else:
log.error(
'Could not store return for event(s) {0}. Returner '
'\'{1}\' not found.'
.format(self.event_queue, self.opts['event_return'])
)
log.error('Could not store return for event(s) - returner '
'\'{1}\' not found.'.format(self.opts['event_return']))
def run(self):
'''