Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/70164.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Stop open pull-socket in engine `webhook` for fixing a memory leak in `EventPublisher`.
2 changes: 1 addition & 1 deletion salt/engines/webhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def start(address=None, port=5000, ssl_crt=None, ssl_key=None):
"""
if __opts__.get("__role") == "master":
fire_master = salt.utils.event.get_master_event(
__opts__, __opts__["sock_dir"]
__opts__, __opts__["sock_dir"], listen=False
).fire_event
else:
fire_master = None
Expand Down
27 changes: 27 additions & 0 deletions tests/pytests/unit/engines/test_webhook.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
"""
unit tests for the webhook engine
"""

from pytest import fixture

import salt.engines.webhook as webhook
from tests.support.mock import MagicMock, patch


@fixture
def configure_loader_modules(master_opts):
return {webhook: {"__opts__": master_opts}}


def test_start_uses_listen_false_for_master(configure_loader_modules):
with patch("salt.utils.event.get_master_event") as get_master_event, patch(
"tornado.httpserver.HTTPServer"
) as fake_http_server, patch("tornado.ioloop.IOLoop") as fake_io_loop:
get_master_event.return_value.fire_event = MagicMock()

webhook.start()

get_master_event.assert_called_once_with(
webhook.__opts__, webhook.__opts__["sock_dir"], listen=False
)
fake_io_loop.return_value.start.assert_called_once()
Loading