Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only log all ClientConnectionResets when returning logs #5715

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Only log all ClientConnectionResets when returning logs #5715

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
380798e
Suppress all ClientConnectionReset when returning logs
sairon Mar 3, 2025
b25a92e
Log ClientConnectionResetError as DEBUG instead of suppressing it
sairon Mar 3, 2025
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
23 changes: 14 additions & 9 deletions supervisor/api/host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,21 @@ async def advanced_logs_handler(
response.content_type = CONTENT_TYPE_TEXT
headers_returned = False
async for cursor, line in journal_logs_reader(resp, log_formatter):
if not headers_returned:
if cursor:
response.headers["X-First-Cursor"] = cursor
response.headers["X-Accel-Buffering"] = "no"
await response.prepare(request)
headers_returned = True
# When client closes the connection while reading busy logs, we
# sometimes get this exception. It should be safe to ignore it.
with suppress(ClientConnectionResetError):
try:
if not headers_returned:
if cursor:
response.headers["X-First-Cursor"] = cursor
response.headers["X-Accel-Buffering"] = "no"
await response.prepare(request)
headers_returned = True
await response.write(line.encode("utf-8") + b"\n")
except ClientConnectionResetError as err:
# When client closes the connection while reading busy logs, we
# sometimes get this exception. It should be safe to ignore it.
_LOGGER.debug(
"ClientConnectionResetError raised when returning journal logs: %s",
err,
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably should return here. If the transport closed, there is no value in continuing trying to write to the stream.

except ConnectionResetError as ex:
raise APIError(
"Connection reset when trying to fetch data from systemd-journald."
Expand Down