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

Remove 'transport' kwarg fom 'salt.utils.event.get_event'

Browse source
This commit is contained in:
MKLeb 2021-12-22 13:47:46 -05:00 • committed by Megan Wilhite
parent cb056ac98b
commit 439aaebe37
28 changed files with 7 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/man/salt.7
View file

@ -61231,7 +61231,7 @@ import salt.utils.event
opts = salt.config.client_config("/etc/salt/master")
event = salt.utils.event.get_event(
"master", sock_dir=opts["sock_dir"], transport=opts["transport"], opts=opts
"master", sock_dir=opts["sock_dir"], opts=opts
)
data = event.get_event()
@ -61305,7 +61305,7 @@ import salt.utils.event
opts = salt.config.client_config("/etc/salt/master")
sevent = salt.utils.event.get_event(
"master", sock_dir=opts["sock_dir"], transport=opts["transport"], opts=opts
"master", sock_dir=opts["sock_dir"], opts=opts
)
while True:

4
doc/topics/event/events.rst
View file

@ -87,7 +87,7 @@ The following code will check for a single event:
opts = salt.config.client_config("/etc/salt/master")
event = salt.utils.event.get_event(
"master", sock_dir=opts["sock_dir"], transport=opts["transport"], opts=opts
"master", sock_dir=opts["sock_dir"], opts=opts
)
data = event.get_event()
@ -138,7 +138,7 @@ using the fnmatch library.
opts = salt.config.client_config("/etc/salt/master")
sevent = salt.utils.event.get_event(
"master", sock_dir=opts["sock_dir"], transport=opts["transport"], opts=opts
"master", sock_dir=opts["sock_dir"], opts=opts
)
while True:

1
salt/client/__init__.py
View file

@ -223,7 +223,6 @@ class LocalClient:
self.event = salt.utils.event.get_event(
"master",
self.opts["sock_dir"],
self.opts["transport"],
opts=self.opts,
listen=self.listen,
io_loop=io_loop,

1
salt/client/mixins.py
View file

@ -313,7 +313,6 @@ class SyncClientMixin(ClientStateMixin):
salt.utils.event.get_event(
"master",
self.opts["sock_dir"],
self.opts["transport"],
opts=self.opts,
listen=False,
),

2
salt/client/ssh/__init__.py
View file

@ -215,7 +215,7 @@ class SSH(MultiprocessingStateMixin):
pull_sock = os.path.join(opts["sock_dir"], "master_event_pull.ipc")
if os.path.exists(pull_sock) and zmq:
self.event = salt.utils.event.get_event(
"master", opts["sock_dir"], opts["transport"], opts=opts, listen=False
"master", opts["sock_dir"], opts=opts, listen=False
)
else:
self.event = None

2
salt/daemons/masterapi.py
View file

@ -401,7 +401,6 @@ class RemoteFuncs:
self.event = salt.utils.event.get_event(
"master",
self.opts["sock_dir"],
self.opts["transport"],
opts=self.opts,
listen=False,
)
@ -1071,7 +1070,6 @@ class LocalFuncs:
self.event = salt.utils.event.get_event(
"master",
self.opts["sock_dir"],
self.opts["transport"],
opts=self.opts,
listen=False,
)

1
salt/engines/fluent.py
View file

@ -78,7 +78,6 @@ def start(host="localhost", port=24224, app="engine"):
else:
event_bus = salt.utils.event.get_event(
"minion",
transport=__opts__["transport"],
opts=__opts__,
sock_dir=__opts__["sock_dir"],
listen=True,

1
salt/engines/http_logstash.py
View file

@ -80,7 +80,6 @@ def start(url, funs=None, tags=None):
with salt.utils.event.get_event(
instance,
sock_dir=__opts__["sock_dir"],
transport=__opts__["transport"],
opts=__opts__,
) as event_bus:
while True:

1
salt/engines/logentries.py
View file

@ -178,7 +178,6 @@ def event_bus_context(opts):
else:
event_bus = salt.utils.event.get_event(
"minion",
transport=opts["transport"],
opts=opts,
sock_dir=opts["sock_dir"],
listen=True,

1
salt/engines/logstash_engine.py
View file

@ -49,7 +49,6 @@ def event_bus_context(opts):
else:
event_bus = salt.utils.event.get_event(
"minion",
transport=opts["transport"],
opts=opts,
sock_dir=opts["sock_dir"],
listen=True,

1
salt/engines/test.py
View file

@ -18,7 +18,6 @@ def event_bus_context(opts):
else:
event_bus = salt.utils.event.get_event(
"minion",
transport=opts["transport"],
opts=opts,
sock_dir=opts["sock_dir"],
listen=True,

1
salt/fileserver/hgfs.py
View file

@ -626,7 +626,6 @@ def update():
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=False,
) as event:

1
salt/fileserver/roots.py
View file

@ -202,7 +202,6 @@ def update():
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=False,
) as event:

1
salt/fileserver/svnfs.py
View file

@ -481,7 +481,6 @@ def update():
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=False,
) as event:

1
salt/key.py
View file

@ -317,7 +317,6 @@ class Key:
self.event = salt.utils.event.get_event(
kind,
opts["sock_dir"],
opts["transport"],
opts=opts,
listen=False,
io_loop=io_loop,

1
salt/modules/event.py
View file

@ -112,7 +112,6 @@ def fire(data, tag):
with salt.utils.event.get_event(
"minion", # was __opts__['id']
sock_dir=__opts__["sock_dir"],
transport=__opts__["transport"],
opts=__opts__,
listen=False,
) as event:

1
salt/modules/state.py
View file

@ -2478,7 +2478,6 @@ def event(
with salt.utils.event.get_event(
node,
sock_dir or __opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=True,
) as sevent:

3
salt/netapi/rest_cherrypy/app.py
View file

@ -2363,7 +2363,6 @@ class Events:
with salt.utils.event.get_event(
"master",
sock_dir=self.opts["sock_dir"],
transport=self.opts["transport"],
opts=self.opts,
listen=True,
) as event:
@ -2539,7 +2538,6 @@ class WebsocketEndpoint:
with salt.utils.event.get_event(
"master",
sock_dir=self.opts["sock_dir"],
transport=self.opts["transport"],
opts=self.opts,
listen=True,
) as event:
@ -2639,7 +2637,6 @@ class Webhook:
self.event = salt.utils.event.get_event(
"master",
sock_dir=self.opts["sock_dir"],
transport=self.opts["transport"],
opts=self.opts,
listen=False,
)

2
salt/netapi/rest_tornado/saltnado.py
View file

@ -275,7 +275,6 @@ class EventListener:
self.event = salt.utils.event.get_event(
"master",
opts["sock_dir"],
opts["transport"],
opts=opts,
listen=True,
io_loop=salt.ext.tornado.ioloop.IOLoop.current(),
@ -1773,7 +1772,6 @@ class WebhookSaltAPIHandler(SaltAPIHandler): # pylint: disable=W0223
self.event = salt.utils.event.get_event(
"master",
self.application.opts["sock_dir"],
self.application.opts["transport"],
opts=self.application.opts,
listen=False,
)

1
salt/runners/queue.py
View file

@ -204,7 +204,6 @@ def process_queue(queue, quantity=1, backend="sqlite", is_runner=False):
with get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=False,
) as event_bus:

5
salt/runners/reactor.py
View file

@ -58,7 +58,6 @@ def list_(saltenv="base", test=None):
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=True,
) as sevent:
@ -91,7 +90,6 @@ def add(event, reactors, saltenv="base", test=None):
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=True,
) as sevent:
@ -123,7 +121,6 @@ def delete(event, saltenv="base", test=None):
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=True,
) as sevent:
@ -154,7 +151,6 @@ def is_leader():
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=True,
) as sevent:
@ -183,7 +179,6 @@ def set_leader(value=True):
with salt.utils.event.get_event(
"master",
__opts__["sock_dir"],
__opts__["transport"],
opts=__opts__,
listen=True,
) as sevent:

2
salt/states/saltmod.py
View file

@ -666,7 +666,7 @@ def wait_for_event(name, id_list, event_id="id", timeout=300, node="master"):
return ret
with salt.utils.event.get_event(
node, __opts__["sock_dir"], __opts__["transport"], opts=__opts__, listen=True
node, __opts__["sock_dir"], opts=__opts__, listen=True
) as sevent:
del_counter = 0

2
salt/utils/cloud.py
View file

@ -2070,7 +2070,7 @@ def fire_event(key, msg, tag, sock_dir, args=None, transport="zeromq"):
Fire deploy action
"""
with salt.utils.event.get_event(
"master", sock_dir, transport, listen=False
"master", sock_dir, listen=False
) as event:
try:
event.fire_event(msg, tag)

1
salt/utils/event.py
View file

@ -106,7 +106,6 @@ TAGS = {
def get_event(
node,
sock_dir=None,
transport="zeromq",
opts=None,
listen=True,
io_loop=None,

1
salt/utils/gitfs.py
View file

@ -2611,7 +2611,6 @@ class GitBase:
with salt.utils.event.get_event(
"master",
self.opts["sock_dir"],
self.opts["transport"],
opts=self.opts,
listen=False,
) as event:

1
salt/utils/reactor.py
View file

@ -213,7 +213,6 @@ class Reactor(salt.utils.process.SignalHandlingProcess, salt.state.Compiler):
with salt.utils.event.get_event(
self.opts["__role"],
self.opts["sock_dir"],
self.opts["transport"],
opts=self.opts,
listen=True,
) as event:

1
salt/utils/schedule.py
View file

@ -801,7 +801,6 @@ class Schedule:
salt.utils.event.get_event(
self.opts["__role"],
self.opts["sock_dir"],
self.opts["transport"],
opts=self.opts,
listen=False,
),

1
tests/eventlisten.py
View file

@ -110,7 +110,6 @@ def listen(opts):
event = salt.utils.event.get_event(
opts["node"],
sock_dir=opts["sock_dir"],
transport=opts["transport"],
opts=opts,
listen=True,
)