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 4

Name conformity

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-08-09 14:06:46 -07:00 • committed by Daniel Wozniak
parent 74195b8306
commit 2f5fe3bcb6
2 changed files with 48 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/transport/base.py
View file

@ -29,7 +29,7 @@ def request_server(opts, **kwargs):
elif ttype == "tcp":
import salt.transport.tcp
return salt.transport.tcp.TCPReqServer(opts)
return salt.transport.tcp.RequestServer(opts)
elif ttype == "ws":
import salt.transport.ws
@ -56,7 +56,9 @@ def request_client(opts, io_loop):
import salt.transport.tcp
resolver = salt.transport.tcp.Resolver()
return salt.transport.tcp.TCPReqClient(opts, resolver=resolver, io_loop=io_loop)
return salt.transport.tcp.RequestClient(
opts, resolver=resolver, io_loop=io_loop
)
elif ttype == "ws":
import salt.transport.ws
@ -96,7 +98,7 @@ def publish_server(opts, **kwargs):
elif ttype == "tcp":
import salt.transport.tcp
return salt.transport.tcp.TCPPublishServer(opts, **kwargs)
return salt.transport.tcp.PublishServer(opts, **kwargs)
elif ttype == "ws":
import salt.transport.ws
@ -129,7 +131,7 @@ def publish_client(opts, io_loop, host=None, port=None, path=None, transport=Non
elif ttype == "tcp":
import salt.transport.tcp
return salt.transport.tcp.TCPPubClient(
return salt.transport.tcp.PublishClient(
opts, io_loop, host=host, port=port, path=path
)
elif ttype == "ws":

48
salt/transport/tcp.py
View file

@ -200,7 +200,7 @@ class Resolver(tornado.netutil.DefaultLoopResolver):
"""
class TCPPubClient(salt.transport.base.PublishClient):
class PublishClient(salt.transport.base.PublishClient):
"""
Tornado based TCP Pub Client
"""
@ -456,7 +456,16 @@ class TCPPubClient(salt.transport.base.PublishClient):
self.close()
class TCPReqServer(salt.transport.base.DaemonizedRequestServer):
class TCPPubClient(PublishClient):
def __init__(self, *args, **kwargs): # pylint: disable=W0231
salt.utils.versions.warn_until(
3009,
"TCPPubClient has been deprecated, use PublishClient instead.",
)
super().__init__(*args, **kwargs)
class RequestServer(salt.transport.base.DaemonizedRequestServer):
"""
Tornado based TCP Request/Reply Server
@ -501,7 +510,7 @@ class TCPReqServer(salt.transport.base.DaemonizedRequestServer):
if exc.errno != 9:
raise
log.exception(
"TCPReqServerChannel close generated an exception: %s", str(exc)
"RequestServer close generated an exception: %s", str(exc)
)
self.req_server = None
@ -537,7 +546,7 @@ class TCPReqServer(salt.transport.base.DaemonizedRequestServer):
message_handler: function to call with your payloads
"""
self.message_handler = message_handler
log.info("ReqServer workers %s", socket)
log.info("RequestServer workers %s", socket)
with salt.utils.asynchronous.current_ioloop(io_loop):
if USE_LOAD_BALANCER:
@ -571,6 +580,15 @@ class TCPReqServer(salt.transport.base.DaemonizedRequestServer):
return payload
class TCPReqServer(RequestServer):
def __init__(self, *args, **kwargs): # pylint: disable=W0231
salt.utils.versions.warn_until(
3009,
"TCPReqServer has been deprecated, use RequestServer instead.",
)
super().__init__(*args, **kwargs)
class SaltMessageServer(tornado.tcpserver.TCPServer):
"""
Raw TCP server which will receive all of the TCP streams and re-assemble
@ -1254,7 +1272,7 @@ class TCPPuller:
self.close()
class TCPPublishServer(salt.transport.base.DaemonizedPublishServer):
class PublishServer(salt.transport.base.DaemonizedPublishServer):
"""
Tornado based TCP PublishServer
"""
@ -1424,6 +1442,15 @@ class TCPPublishServer(salt.transport.base.DaemonizedPublishServer):
self.pub_sock = None
class TCPPublishServer(PublishServer):
def __init__(self, *args, **kwargs): # pylint: disable=W0231
salt.utils.versions.warn_until(
3009,
"TCPPublishServer has been deprecated, use PublishServer instead.",
)
super().__init__(*args, **kwargs)
class _TCPPubServerPublisher:
"""
Salt IPC message client
@ -1605,7 +1632,7 @@ class _TCPPubServerPublisher:
await self.stream.write(pack)
class TCPReqClient(salt.transport.base.RequestClient):
class RequestClient(salt.transport.base.RequestClient):
"""
Tornado based TCP RequestClient
"""
@ -1806,3 +1833,12 @@ class TCPReqClient(salt.transport.base.RequestClient):
if self._stream is not None:
self._stream.close()
self._stream = None
class TCPReqClient(RequestClient):
def __init__(self, *args, **kwargs): # pylint: disable=W0231
salt.utils.versions.warn_until(
3009,
"TCPReqClient has been deprecated, use RequestClient instead.",
)
super().__init__(*args, **kwargs)