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 #40689 from jbadson/fix-syslog-returner

Browse source 
Fixes bug that prevents syslog returner from working under Python 2.6
This commit is contained in:
Mike Place 2017-04-14 04:45:12 -06:00 • committed by GitHub
commit bc70772f9d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/returners/syslog_return.py
View file

@ -192,10 +192,14 @@ def returner(ret):
logoption = logoption | getattr(syslog, opt)
# Open syslog correctly based on options and tag
if 'tag' in _options:
syslog.openlog(ident=_options['tag'], logoption=logoption)
else:
syslog.openlog(logoption=logoption)
try:
if 'tag' in _options:
syslog.openlog(ident=_options['tag'], logoption=logoption)
else:
syslog.openlog(logoption=logoption)
except TypeError:
# Python 2.6 syslog.openlog does not accept keyword args
syslog.openlog(_options.get('tag', 'salt-minion'), logoption)
# Send log of given level and facility
syslog.syslog(facility | level, '{0}'.format(json.dumps(ret)))