SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logs-show: read the current boot ID if nothing specified for add_match_boot_id()

Browse Source 
No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2024-03-26 23:54:46 +09:00
parent 8e976dc920
commit 0aad30d4b5
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal-remote/journal-gatewayd.c
+1 -9
View File
@@ -512,15 +512,7 @@ static mhd_result request_parse_arguments_iterator(
}
if (r) {
sd_id128_t bid;
r = sd_id128_get_boot(&bid);
if (r < 0) {
log_error_errno(r, "Failed to get boot ID: %m");
return MHD_NO;
}
r = add_match_boot_id(m->journal, bid);
r = add_match_boot_id(m->journal, SD_ID128_NULL);
if (r < 0) {
m->argument_parse_error = r;
return MHD_NO;
src/shared/logs-show.c
+15 -4
View File
@@ -1636,10 +1636,21 @@ int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) {
}
int add_match_boot_id(sd_journal *j, sd_id128_t id) {
assert(j);
assert(!sd_id128_is_null(id));
int r;
return journal_add_match_pair(j, "_BOOT_ID", SD_ID128_TO_STRING(id));
assert(j);
if (sd_id128_is_null(id)) {
r = sd_id128_get_boot(&id);
if (r < 0)
return log_error_errno(r, "Failed to get boot ID: %m");
}
r = journal_add_match_pair(j, "_BOOT_ID", SD_ID128_TO_STRING(id));
if (r < 0)
return log_error_errno(r, "Failed to add match: %m");
return 0;
}
int add_match_this_boot(sd_journal *j, const char *machine) {
@@ -1655,7 +1666,7 @@ int add_match_this_boot(sd_journal *j, const char *machine) {
r = add_match_boot_id(j, boot_id);
if (r < 0)
return log_error_errno(r, "Failed to add match: %m");
return r;
r = sd_journal_add_conjunction(j);
if (r < 0)