Merge pull request #38474 from cachedout/key_loop

Allow an existing ioloop to be passed to salt-key
This commit is contained in:
Mike Place 2016-12-29 09:28:51 -07:00 committed by GitHub
commit 59f2560d88

View file

@ -533,7 +533,7 @@ class Key(object):
REJ = 'minions_rejected'
DEN = 'minions_denied'
def __init__(self, opts):
def __init__(self, opts, io_loop=None):
self.opts = opts
kind = self.opts.get('__role', '') # application kind
if kind not in kinds.APPL_KINDS:
@ -545,7 +545,9 @@ class Key(object):
opts['sock_dir'],
opts['transport'],
opts=opts,
listen=False)
listen=False,
io_loop=io_loop
)
def _check_minions_directories(self):
'''