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

Fix presence events on TCP transport

Browse source
This commit is contained in:
Jakub Recman 2022-10-06 13:57:09 +02:00 • committed by Megan Wilhite
parent 2bb2604f74
commit 49a9532475
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/channel/server.py
View file

@ -774,7 +774,9 @@ class PubServerChannel:
secrets = kwargs.get("secrets", None)
if secrets is not None:
salt.master.SMaster.secrets = secrets
self.transport.publish_daemon(self.publish_payload, self.presence_callback)
self.transport.publish_daemon(
self.publish_payload, self.presence_callback, self.remove_presence_callback
)
def presence_callback(self, subscriber, msg):
if msg["enc"] != "aes":

2
salt/transport/tcp.py
View file

@ -938,7 +938,7 @@ class PubServer(salt.ext.tornado.tcpserver.TCPServer):
"Subscriber at %s has disconnected from publisher", client.address
)
client.close()
self._remove_client_present(client)
self.remove_presence_callback(client)
self.clients.discard(client)
log.trace("TCP PubServer finished publishing payload")