[systemd-devel] [PATCH] journalctl: add "-t --identifier=STRING" option

[Ronny Chevalier]

2014-08-19 12:12 GMT+02:00  <harald at redhat.com>:
> From: Harald Hoyer <harald at redhat.com>
>
> This turns journalctl to the counterpart of systemd-cat.
> Messages sent with
>
> systemd-cat --identifier foo --prioritiy debug
>
> can now be shown with
>
> journalctl --identifier foo --prioritiy debug
>
> "--identifier" is not merged with "--unit" to make a clear
> distinction between syslog and systemd units.
> syslog identifiers can be chosen freely by anyone.
> ---
>  man/journalctl.xml       | 14 ++++++++++++++
>  src/journal/journalctl.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 56 insertions(+), 1 deletion(-)
>
> diff --git a/man/journalctl.xml b/man/journalctl.xml
> index bf18756..906ffd0 100644
> --- a/man/journalctl.xml
> +++ b/man/journalctl.xml
> @@ -498,6 +498,20 @@
>                          </varlistentry>
>
>                          <varlistentry>
> +                                <term><option>-t</option></term>
> +                                <term><option>--identifier=<replaceable>SYSLOG_IDENTIFIER</replaceable>|<replaceable>PATTERN</replaceable></option></term>
> +
> +                                <listitem><para>Show messages for the
> +                                specified syslog identifier
> +                                <replaceable>SYSLOG_IDENTIFIER</replaceable>, or
> +                                for any of the messages with a <literal>SYSLOG_IDENTIFIER</literal>
> +                                matched by <replaceable>PATTERN</replaceable>.</para>
> +
> +                                <para>This parameter can be specified
> +                                multiple times.</para></listitem>
> +                        </varlistentry>
> +
> +                        <varlistentry>
>                                  <term><option>-u</option></term>
>                                  <term><option>--unit=<replaceable>UNIT</replaceable>|<replaceable>PATTERN</replaceable></option></term>
>
> diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
> index 5c4a71d..3037fb8 100644
> --- a/src/journal/journalctl.c
> +++ b/src/journal/journalctl.c
> @@ -89,6 +89,7 @@ static bool arg_force = false;
>  #endif
>  static usec_t arg_since, arg_until;
>  static bool arg_since_set = false, arg_until_set = false;
> +static char **arg_syslog_identifier = NULL;
>  static char **arg_system_units = NULL;
>  static char **arg_user_units = NULL;
>  static const char *arg_field = NULL;
> @@ -180,6 +181,7 @@ static void help(void) {
>                 "  -k --dmesg               Show kernel message log from the current boot\n"
>                 "  -u --unit=UNIT           Show data only from the specified unit\n"
>                 "     --user-unit=UNIT      Show data only from the specified user session unit\n"
> +               "  -t --identifier=STRING   Show only messages wit the specified syslog identifier\n"
with*

>                 "  -p --priority=RANGE      Show only messages within the specified priority range\n"
>                 "  -e --pager-end           Immediately jump to end of the journal in the pager\n"
>                 "  -f --follow              Follow the journal\n"
> @@ -276,6 +278,7 @@ static int parse_argv(int argc, char *argv[]) {
>                  { "file",           required_argument, NULL, ARG_FILE           },
>                  { "root",           required_argument, NULL, ARG_ROOT           },
>                  { "header",         no_argument,       NULL, ARG_HEADER         },
> +                { "identifier",     required_argument, NULL, 't'                },
>                  { "priority",       required_argument, NULL, 'p'                },
>                  { "setup-keys",     no_argument,       NULL, ARG_SETUP_KEYS     },
>                  { "interval",       required_argument, NULL, ARG_INTERVAL       },
> @@ -304,7 +307,7 @@ static int parse_argv(int argc, char *argv[]) {
>          assert(argc >= 0);
>          assert(argv);
>
> -        while ((c = getopt_long(argc, argv, "hefo:aln::qmb::kD:p:c:u:F:xrM:", options, NULL)) >= 0)
> +        while ((c = getopt_long(argc, argv, "hefo:aln::qmb::kD:p:c:t:u:F:xrM:", options, NULL)) >= 0)
>
>                  switch (c) {
>
> @@ -590,6 +593,12 @@ static int parse_argv(int argc, char *argv[]) {
>                          arg_until_set = true;
>                          break;
>
> +                case 't':
> +                        r = strv_extend(&arg_syslog_identifier, optarg);
> +                        if (r < 0)
> +                                return log_oom();
> +                        break;
> +
>                  case 'u':
>                          r = strv_extend(&arg_system_units, optarg);
>                          if (r < 0)
> @@ -1212,6 +1221,32 @@ static int add_priorities(sd_journal *j) {
>          return 0;
>  }
>
> +
> +static int add_syslog_identifier(sd_journal *j) {
> +        int r;
> +        char **i;
> +
> +        assert(j);
> +
> +        STRV_FOREACH(i, arg_syslog_identifier) {
> +                char *u;
> +
> +                u = strappenda("SYSLOG_IDENTIFIER=", *i);
> +                r = sd_journal_add_match(j, u, 0);
> +                if (r < 0)
> +                        return r;
> +                r = sd_journal_add_disjunction(j);
> +                if (r < 0)
> +                        return r;
> +        }
> +
> +        r = sd_journal_add_conjunction(j);
> +        if (r < 0)
> +                return r;
> +
> +        return 0;
> +}
> +
>  static int setup_keys(void) {
>  #ifdef HAVE_GCRYPT
>          size_t mpk_size, seed_size, state_size, i;
> @@ -1705,6 +1740,12 @@ int main(int argc, char *argv[]) {
>                  return EXIT_FAILURE;
>          }
>
> +        r = add_syslog_identifier(j);
> +        if (r < 0) {
> +                log_error("Failed to add filter for syslog identifiers: %s", strerror(-r));
> +                return EXIT_FAILURE;
> +        }
> +
>          r = add_priorities(j);
>          if (r < 0) {
>                  log_error("Failed to add filter for priorities: %s", strerror(-r));
> --
> 2.0.4
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel