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 #24065 from makinacorpus/real23883

Browse source 
continue to fix #23883
This commit is contained in:
Colton Myers 2015-05-22 12:59:21 -06:00
commit bfd812c56b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/utils/event.py
View file

@ -107,9 +107,10 @@ def get_event(node, sock_dir=None, transport='zeromq', opts=None, listen=True):
'''
Return an event object suitable for the named transport
'''
sock_dir = sock_dir or opts.get('sock_dir', None)
if transport == 'zeromq':
if node == 'master':
return MasterEvent(sock_dir or opts.get('sock_dir', None), opts)
return MasterEvent(sock_dir, opts)
return SaltEvent(node, sock_dir, opts)
elif transport == 'raet':
import salt.utils.raetevent