Skip to content

Commit

Permalink
Merge pull request #34773 from randomed/mysql-returner-startup/2015.8
Browse files Browse the repository at this point in the history
Bugfix: Startup states on minions are not being written to mysql returner
  • Loading branch information
Mike Place committed Jul 19, 2016
2 parents 10a1af9 + 0cd55eb commit 5802103
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions salt/returners/mysql.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ def returner(ret):
'''
Return data to a mysql server
'''
# if a minion is returning a standalone job, get a jobid
if ret['jid'] == 'req':
ret['jid'] = prep_jid(nocache=ret.get('nocache', False))
save_load(ret['jid'], ret)

try:
with _get_serv(ret, commit=True) as cur:
sql = '''INSERT INTO `salt_returns`
Expand Down

0 comments on commit 5802103

Please sign in to comment.