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 #23811 from rallytime/bp-23786

Browse source 
Backport #23786 to 2015.5
This commit is contained in:
Justin Findlay 2015-05-18 09:30:27 -06:00
commit c6f939adfb
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/returners/mysql.py
View file

@ -240,7 +240,8 @@ def returner(ret):
ret['id'],
ret.get('success', False),
json.dumps(ret)))
except salt.exceptions.SaltMasterError:
except salt.exceptions.SaltMasterError as exc:
log.critical(exc)
log.critical('Could not store return with MySQL returner. MySQL server unavailable.')