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

First stab at mysql pools with context

Browse Source
This commit is contained in:
Mike Place 2015-02-11 21:42:21 -07:00
parent 89f1bc9d6d
commit 42dd4e6155
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/loader.py
View File

@ -158,7 +158,7 @@ def returners(opts, functions, whitelist=None, context=None):
Returns the returner modules
'''
if context is None:
conext = {}
context = {}
return LazyLoader(_module_dirs(opts, 'returners', 'returner'),
opts,
tag='returner',

28
salt/returners/mysql.py
View File

@ -156,14 +156,26 @@ 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'),
pool_size=32)
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