fix: handle socket close errors properly in PapertrailLogHandler
- Replace contextlib.suppress with try/except + warning log - Add test for fail2ban client - Remove stale Issue #21 from Tasks.md (indexes) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -7,7 +7,6 @@ fashion using async buffering and batching.
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import contextlib
|
||||
import json
|
||||
from abc import ABC, abstractmethod
|
||||
from collections import deque
|
||||
@@ -244,8 +243,10 @@ class PapertrailLogHandler(ExternalLogHandler):
|
||||
await writer.drain()
|
||||
finally:
|
||||
writer.close()
|
||||
with contextlib.suppress(Exception):
|
||||
try:
|
||||
await writer.wait_closed()
|
||||
except Exception as e:
|
||||
log.warning("external_logging_writer_close_error", error=str(e))
|
||||
|
||||
@staticmethod
|
||||
def _severity_from_level(level: str) -> int:
|
||||
|
||||
@@ -17,7 +17,6 @@ Usage::
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import contextlib
|
||||
import errno
|
||||
import sys
|
||||
import time
|
||||
@@ -189,8 +188,15 @@ def _send_command_sync(
|
||||
) from exc
|
||||
finally:
|
||||
if client is not None:
|
||||
with contextlib.suppress(Exception):
|
||||
try:
|
||||
client.close()
|
||||
except Exception as e:
|
||||
log.warning(
|
||||
"fail2ban_socket_close_error",
|
||||
socket_path=socket_path,
|
||||
error=str(e),
|
||||
exc_info=True,
|
||||
)
|
||||
|
||||
raise Fail2BanConnectionError(
|
||||
str(last_oserror), socket_path
|
||||
|
||||
@@ -214,6 +214,38 @@ class TestCoerceCommandToken:
|
||||
assert _coerce_command_token(None) == "None"
|
||||
|
||||
|
||||
class TestSendCommandSyncCloseError:
|
||||
"""Tests for socket close error handling in :func:`_send_command_sync`."""
|
||||
|
||||
def test_close_error_is_logged_but_not_reRaised(self) -> None:
|
||||
"""close() raising must log a warning, not mask the original error."""
|
||||
fake_client = MagicMock()
|
||||
fake_client.send.return_value = [0, "ok"]
|
||||
fake_client.close.side_effect = RuntimeError("close failed")
|
||||
fake_cls = MagicMock(return_value=fake_client)
|
||||
|
||||
with (
|
||||
patch(
|
||||
"app.utils.fail2ban_client._load_vendored_fail2ban_client",
|
||||
return_value=fake_cls,
|
||||
),
|
||||
patch("app.utils.fail2ban_client.log") as mock_log,
|
||||
):
|
||||
result = _send_command_sync(
|
||||
socket_path="/fake/fail2ban.sock",
|
||||
command=["status"],
|
||||
timeout=1.0,
|
||||
)
|
||||
|
||||
assert result == [0, "ok"]
|
||||
warning_calls = [
|
||||
c for c in mock_log.warning.call_args_list
|
||||
if c[0][0] == "fail2ban_socket_close_error"
|
||||
]
|
||||
assert len(warning_calls) == 1
|
||||
assert warning_calls[0][1]["error"] == "close failed"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Extended tests for Fail2BanClient.send
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user