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

sqlite3 returner support function args

Browse Source
This commit is contained in:
Mickey Malone 2013-10-06 10:23:59 -05:00
parent 3f830a51bf
commit 7e9b082f50
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/returners/sqlite3_return.py
View File

@ -37,6 +37,7 @@ Use the commands to create the sqlite3 database and tables::
fun TEXT KEY, fun TEXT KEY,
jid TEXT KEY, jid TEXT KEY,
id TEXT KEY, id TEXT KEY,
fun_args TEXT,
date TEXT NOT NULL, date TEXT NOT NULL,
full_ret TEXT NOT NULL, full_ret TEXT NOT NULL,
success TEXT NOT NULL success TEXT NOT NULL
@ -103,12 +104,13 @@ def returner(ret):
conn = _get_conn() conn = _get_conn()
cur = conn.cursor() cur = conn.cursor()
sql = '''INSERT INTO salt_returns sql = '''INSERT INTO salt_returns
(fun, jid, id, date, full_ret, success) (fun, jid, id, fun_args, date, full_ret, success)
VALUES (:fun, :jid, :id, :date, :full_ret, :success)''' VALUES (:fun, :jid, :id, :fun_args, :date, :full_ret, :success)'''
cur.execute(sql, cur.execute(sql,
{'fun': ret['fun'], {'fun': ret['fun'],
'jid': ret['jid'], 'jid': ret['jid'],
'id': ret['id'], 'id': ret['id'],
'fun_args': str(ret['fun_args']) if ret['fun_args'] else None,
'date': str(datetime.datetime.now()), 'date': str(datetime.datetime.now()),
'full_ret': json.dumps(ret['return']), 'full_ret': json.dumps(ret['return']),
'success': ret['success']}) 'success': ret['success']})