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

Merge pull request #31899 from yuwata/sd-journal-add-match

Browse Source 
sd-journal: introduce two helpers for adding journal filter
This commit is contained in:
Yu Watanabe
2024-03-26 02:56:58 +09:00
committed by GitHub
parent 6871b9c638 bcd558f12e
commit 0ffcf398e5
6 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkctl.c
+5 -14
View File
@@ -37,6 +37,7 @@
#include "glob-util.h"
#include "hwdb-util.h"
#include "ipvlan-util.h"
#include "journal-internal.h"
#include "local-addresses.h"
#include "locale-util.h"
#include "logs-show.h"
@@ -1613,22 +1614,12 @@ static int show_logs(const LinkInfo *info) {
return log_error_errno(r, "Failed to add boot matches: %m");
if (info) {
char m1[STRLEN("_KERNEL_DEVICE=n") + DECIMAL_STR_MAX(int)];
const char *m2, *m3;
/* kernel */
xsprintf(m1, "_KERNEL_DEVICE=n%i", info->ifindex);
/* networkd */
m2 = strjoina("INTERFACE=", info->name);
/* udevd */
m3 = strjoina("DEVICE=", info->name);
(void)(
(r = sd_journal_add_match(j, m1, 0)) ||
(void) (
(r = journal_add_matchf(j, "_KERNEL_DEVICE=n%i", info->ifindex)) || /* kernel */
(r = sd_journal_add_disjunction(j)) ||
(r = sd_journal_add_match(j, m2, 0)) ||
(r = journal_add_match_pair(j, "INTERFACE", info->name)) || /* networkd */
(r = sd_journal_add_disjunction(j)) ||
(r = sd_journal_add_match(j, m3, 0))
(r = journal_add_match_pair(j, "DEVICE", info->name)) /* udevd */
);
if (r < 0)
return log_error_errno(r, "Failed to add link matches: %m");