jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-13 12:16:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the oldest boot ID is included in the boot list (#5591)

Browse Source 
If the system is running for a long time, or the logging is particularly
chatty, the Systemd journal message we use to detect boot will be
rotated out of the journal. Currently we only handled it if there was
one boot, but we usually always missed the oldest boot if there were
more boots.

Adjust the method for getting boot IDs to always get the very first log
line in the journal instead of the last one, and make sure its boot ID
is included in the list.
This commit is contained in:
Jan Čermák 2025-01-31 11:55:05 +01:00 committed by GitHub
parent 28a87db515
commit 1aabca9489
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
supervisor/host/logs.py
View File

@ -111,25 +111,29 @@ class LogsControl(CoreSysAttributes):
_LOGGER.error,
) from err
# If a system has not been rebooted in a long time query can come back with zero results
# Fallback is to get latest log line and its boot ID so we always have at least one.
if not text:
# Get the oldest log entry. This makes sure that its ID is included
# if the start of the oldest boot was rotated out of the journal.
try:
async with self.journald_logs(
range_header="entries=:-1:1",
range_header="entries=:0:1",
accept=LogFormat.JSON,
timeout=ClientTimeout(total=20),
) as resp:
text = await resp.text()
text = await resp.text() + text
except (ClientError, TimeoutError) as err:
raise HostLogError(
"Could not get a list of boot IDs from systemd-journal-gatewayd",
_LOGGER.error,
) from err
self._boot_ids = [
json.loads(entry)[PARAM_BOOT_ID] for entry in text.split("\n") if entry
]
self._boot_ids = []
for entry in text.split("\n"):
if (
entry
and (boot_id := json.loads(entry)[PARAM_BOOT_ID]) not in self._boot_ids
):
self._boot_ids.append(boot_id)
return self._boot_ids
async def get_identifiers(self) -> list[str]: