saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24001 from msteed/issue-23883

Browse source 
issue #23883
This commit is contained in:
Nicole Thomas 2015-05-21 14:32:30 -06:00
commit ac32000b5d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/utils/event.py
View file

@ -109,7 +109,7 @@ def get_event(node, sock_dir=None, transport='zeromq', opts=None, listen=True):
'''
if transport == 'zeromq':
if node == 'master':
return MasterEvent(sock_dir or opts.get('sock_dir', None))
return MasterEvent(sock_dir or opts.get('sock_dir', None), opts)
return SaltEvent(node, sock_dir, opts)
elif transport == 'raet':
import salt.utils.raetevent
@ -124,7 +124,7 @@ def get_master_event(opts, sock_dir, listen=True):
Return an event object suitable for the named transport
'''
if opts['transport'] == 'zeromq':
return MasterEvent(sock_dir)
return MasterEvent(sock_dir, opts)
elif opts['transport'] == 'raet':
import salt.utils.raetevent
return salt.utils.raetevent.MasterEvent(opts=opts, sock_dir=sock_dir, listen=listen)
@ -506,8 +506,8 @@ class MasterEvent(SaltEvent):
RAET compatible
Create a master event management object
'''
def __init__(self, sock_dir):
super(MasterEvent, self).__init__('master', sock_dir)
def __init__(self, sock_dir, opts=None):
super(MasterEvent, self).__init__('master', sock_dir, opts)
class LocalClientEvent(MasterEvent):