dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

journalctl: allow globbing in --unit and --user-unit

Browse Source 
This is a continuation of e3e0314b systemctl: allow globbing in commands
which take multiple unit names.

Multiple patterns can be specified, as separate arguments, or as one argument
with patterns seperated by commas.

If patterns are given, at least one unit must be matched (by any of the patterns).
This is different behaviour than systemctl, but here it is necessary because
otherwise anything would be matched, which is unlikely to be the intended
behaviour.

https://bugs.freedesktop.org/show_bug.cgi?id=59336
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2013-12-28 19:47:36 -05:00
parent ae97089d49
commit ea18a4b57e
2 changed files with 185 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
man/journalctl.xml
View File

@@ -509,17 +509,27 @@
<varlistentry>
<term><option>-u</option></term>
<term><option>--unit=</option></term>
<term><option>--unit=<replaceable>UNIT</replaceable>|<replaceable>PATTERN</replaceable></option></term>
<listitem><para>Show messages for the
specified systemd unit. This will add
a match for messages from the unit
(<literal>_SYSTEMD_UNIT=</literal>)
and additional matches for messages
from systemd and messages about
coredumps for the specified unit.</para>
<para>This parameter can be specified multiple times.
</para></listitem>
specified systemd unit
<replaceable>UNIT</replaceable>, or
for any of the units matched by
<replaceable>PATTERN</replaceable>.
If a pattern is specified, a list of
unit names found in the journal is
compared with the specified pattern
and all that match are used. For each
unit name a match is added for
messages from the unit
(<literal>_SYSTEMD_UNIT=<replaceable>UNIT</replaceable></literal>)
along with additional matches for
messages from systemd and messages
about coredumps for the specified
unit.</para>
<para>This parameter can be specified
multiple times. </para></listitem>
</varlistentry>
<varlistentry>

187
src/journal/journalctl.c
View File

@@ -21,6 +21,7 @@
#include <locale.h>
#include <fcntl.h>
#include <fnmatch.h>
#include <errno.h>
#include <stddef.h>
#include <string.h>
@@ -49,6 +50,7 @@
#include "build.h"
#include "pager.h"
#include "strv.h"
#include "set.h"
#include "journal-internal.h"
#include "journal-def.h"
#include "journal-verify.h"
@@ -983,40 +985,177 @@ static int add_dmesg(sd_journal *j) {
return 0;
}
static int add_units(sd_journal *j) {
_cleanup_free_ char *u = NULL;
static int get_possible_units(sd_journal *j,
const char *fields,
char **patterns,
Set **units) {
_cleanup_set_free_free_ Set *found;
const char *field;
int r;
found = set_new(string_hash_func, string_compare_func);
if (!found)
return log_oom();
NULSTR_FOREACH(field, fields) {
const void *data;
size_t size;
r = sd_journal_query_unique(j, field);
if (r < 0)
return r;
SD_JOURNAL_FOREACH_UNIQUE(j, data, size) {
char **pattern, *eq;
size_t prefix;
_cleanup_free_ char *u = NULL;
eq = memchr(data, '=', size);
if (eq)
prefix = eq - (char*) data + 1;
else
prefix = 0;
u = strndup((char*) data + prefix, size - prefix);
if (!u)
return log_oom();
STRV_FOREACH(pattern, patterns)
if (fnmatch(*pattern, u, FNM_NOESCAPE) == 0) {
log_debug("Matched %s with pattern %s=%s", u, field, *pattern);
r = set_consume(found, u);
u = NULL;
if (r < 0 && r != -EEXIST)
return r;
break;
}
}
}
*units = found;
found = NULL;
return 0;
}
/* This list is supposed to return the superset of unit names
* possibly matched by rules added with add_matches_for_unit... */
#define SYSTEM_UNITS \
"_SYSTEMD_UNIT\0" \
"COREDUMP_UNIT\0" \
"UNIT\0" \
"OBJECT_SYSTEMD_UNIT\0" \
"_SYSTEMD_SLICE\0"
/* ... and add_matches_for_user_unit */
#define USER_UNITS \
"_SYSTEMD_USER_UNIT\0" \
"USER_UNIT\0" \
"COREDUMP_USER_UNIT\0" \
"OBJECT_SYSTEMD_USER_UNIT\0"
static int add_units(sd_journal *j) {
_cleanup_strv_free_ char **patterns = NULL;
int r, count = 0;
char **i;
assert(j);
STRV_FOREACH(i, arg_system_units) {
u = unit_name_mangle(*i, MANGLE_NOGLOB);
_cleanup_free_ char *u = NULL;
u = unit_name_mangle(*i, MANGLE_GLOB);
if (!u)
return log_oom();
r = add_matches_for_unit(j, u);
if (r < 0)
return r;
r = sd_journal_add_disjunction(j);
if (r < 0)
return r;
if (string_is_glob(u)) {
r = strv_push(&patterns, u);
if (r < 0)
return r;
u = NULL;
} else {
r = add_matches_for_unit(j, u);
if (r < 0)
return r;
r = sd_journal_add_disjunction(j);
if (r < 0)
return r;
count ++;
}
}
if (!strv_isempty(patterns)) {
_cleanup_set_free_free_ Set *units = NULL;
Iterator it;
char *u;
r = get_possible_units(j, SYSTEM_UNITS, patterns, &units);
if (r < 0)
return r;
SET_FOREACH(u, units, it) {
r = add_matches_for_unit(j, u);
if (r < 0)
return r;
r = sd_journal_add_disjunction(j);
if (r < 0)
return r;
count ++;
}
}
strv_free(patterns);
patterns = NULL;
STRV_FOREACH(i, arg_user_units) {
u = unit_name_mangle(*i, MANGLE_NOGLOB);
_cleanup_free_ char *u = NULL;
u = unit_name_mangle(*i, MANGLE_GLOB);
if (!u)
return log_oom();
r = add_matches_for_user_unit(j, u, getuid());
if (r < 0)
return r;
r = sd_journal_add_disjunction(j);
if (r < 0)
return r;
if (string_is_glob(u)) {
r = strv_push(&patterns, u);
if (r < 0)
return r;
u = NULL;
} else {
r = add_matches_for_user_unit(j, u, getuid());
if (r < 0)
return r;
r = sd_journal_add_disjunction(j);
if (r < 0)
return r;
count ++;
}
}
if (!strv_isempty(patterns)) {
_cleanup_set_free_free_ Set *units = NULL;
Iterator it;
char *u;
r = get_possible_units(j, USER_UNITS, patterns, &units);
if (r < 0)
return r;
SET_FOREACH(u, units, it) {
r = add_matches_for_user_unit(j, u, getuid());
if (r < 0)
return r;
r = sd_journal_add_disjunction(j);
if (r < 0)
return r;
count ++;
}
}
/* Complain if the user request matches but nothing whatsoever was
* found, since otherwise everything would be matched. */
if (!(strv_isempty(arg_system_units) && strv_isempty(arg_user_units)) && count == 0)
return -ENODATA;
r = sd_journal_add_conjunction(j);
if (r < 0)
return r;
@@ -1543,16 +1682,22 @@ int main(int argc, char *argv[]) {
strv_free(arg_system_units);
strv_free(arg_user_units);
if (r < 0)
if (r < 0) {
log_error("Failed to add filter for units: %s", strerror(-r));
return EXIT_FAILURE;
}
r = add_priorities(j);
if (r < 0)
if (r < 0) {
log_error("Failed to add filter for priorities: %s", strerror(-r));
return EXIT_FAILURE;
}
r = add_matches(j, argv + optind);
if (r < 0)
if (r < 0) {
log_error("Failed to add filters: %s", strerror(-r));
return EXIT_FAILURE;
}
if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
_cleanup_free_ char *filter;