Skip to content

Commit ed71556

Browse files
authored
Fix range header to correctly fetch latest logs (#6202)
* Fix range header to correctly fetch latest logs Add a colon before line numbers to indicate that no cursor is used. This makes the range header work when fetching latest logs from systemd-journal-gatewayd. * Fix pytest
1 parent 595e33a commit ed71556

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

supervisor/api/host.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ async def advanced_logs_handler(
267267
# entries=cursor[[:num_skip]:num_entries]
268268
range_header = f"entries=:-{lines - 1}:{SYSTEMD_JOURNAL_GATEWAYD_LINES_MAX if follow else lines}"
269269
elif latest:
270-
range_header = f"entries=0:{SYSTEMD_JOURNAL_GATEWAYD_LINES_MAX}"
270+
range_header = f"entries=:0:{SYSTEMD_JOURNAL_GATEWAYD_LINES_MAX}"
271271
elif RANGE in request.headers:
272272
range_header = request.headers[RANGE]
273273
else:

tests/api/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async def common_test_api_advanced_logs(
6464
logs_call = journald_logs.call_args_list[1]
6565
assert logs_call[1]["params"]["SYSLOG_IDENTIFIER"] == syslog_identifier
6666
assert logs_call[1]["params"]["CONTAINER_LOG_EPOCH"] == "12345"
67-
assert logs_call[1]["range_header"] == "entries=0:18446744073709551615"
67+
assert logs_call[1]["range_header"] == "entries=:0:18446744073709551615"
6868

6969
journald_logs.reset_mock()
7070

0 commit comments

Comments
 (0)