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

Merge pull request #20666 from cachedout/returner_context

Browse Source 
Returner context
This commit is contained in:
Mike Place 2015-02-12 17:30:05 -07:00
commit 290b9216d9
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/loader.py
View File

@ -153,15 +153,18 @@ def proxy(opts, functions, whitelist=None):
pack={'__proxy__': functions})
def returners(opts, functions, whitelist=None):
def returners(opts, functions, whitelist=None, context=None):
'''
Returns the returner modules
'''
if context is None:
context = {}
return LazyLoader(_module_dirs(opts, 'returners', 'returner'),
opts,
tag='returner',
whitelist=whitelist,
pack={'__salt__': functions})
pack={'__salt__': functions,
'__context__': context})
def utils(opts, whitelist=None):

29
salt/returners/mysql.py
View File

@ -156,14 +156,25 @@ def _get_serv(ret=None, commit=False):
Return a mysql cursor
'''
_options = _get_options(ret)
try:
conn = MySQLdb.connect(host=_options.get('host'),
user=_options.get('user'),
passwd=_options.get('pass'),
db=_options.get('db'),
port=_options.get('port'))
except MySQLdb.connections.OperationalError as exc:
raise salt.exceptions.SaltMasterError('MySQL returner could not connect to database: {exc}'.format(exc=exc))
if __context__ and 'mysql_returner_conn' in __context__:
log.debug('Reusing MySQL connection pool')
conn = __context__['mysql_returner_conn']
else:
log.debug('Generating new MySQL connection pool')
try:
conn = MySQLdb.connect(host=_options.get('host'),
user=_options.get('user'),
passwd=_options.get('pass'),
db=_options.get('db'),
port=_options.get('port'))
try:
__context__['mysql_returner_conn'] = conn
except TypeError:
pass
except MySQLdb.connections.OperationalError as exc:
raise salt.exceptions.SaltMasterError('MySQL returner could not connect to database: {exc}'.format(exc=exc))
cursor = conn.cursor()
try:
yield cursor
@ -177,8 +188,6 @@ def _get_serv(ret=None, commit=False):
cursor.execute("COMMIT")
else:
cursor.execute("ROLLBACK")
finally:
conn.close()
def returner(ret):