From: Lennart Poettering Date: Mon, 21 Feb 2022 12:44:37 +0000 (+0100) Subject: analyze: split out log control verb X-Git-Tag: v251-rc1~249^2~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faaa6ea076338a34f04644e2bc38340fd09bb0f7;p=thirdparty%2Fsystemd.git analyze: split out log control verb --- diff --git a/src/analyze/analyze-log-control.c b/src/analyze/analyze-log-control.c new file mode 100644 index 00000000000..d31081b6a0b --- /dev/null +++ b/src/analyze/analyze-log-control.c @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ + +#include "analyze.h" +#include "analyze-log-control.h" +#include "verb-log-control.h" + +int verb_log_control(int argc, char *argv[], void *userdata) { + _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; + int r; + + assert(IN_SET(argc, 1, 2)); + + r = acquire_bus(&bus, NULL); + if (r < 0) + return bus_log_connect_error(r, arg_transport); + + return verb_log_control_common(bus, "org.freedesktop.systemd1", argv[0], argc == 2 ? argv[1] : NULL); +} diff --git a/src/analyze/analyze-log-control.h b/src/analyze/analyze-log-control.h new file mode 100644 index 00000000000..350c22861a6 --- /dev/null +++ b/src/analyze/analyze-log-control.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +#pragma once + +int verb_log_control(int argc, char *argv[], void *userdata); diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index dc3bf9c17ec..b1eb51ce7d3 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -23,6 +23,7 @@ #include "analyze-elf.h" #include "analyze-exit-status.h" #include "analyze-filesystems.h" +#include "analyze-log-control.h" #include "analyze-plot.h" #include "analyze-security.h" #include "analyze-service-watchdogs.h" @@ -435,19 +436,6 @@ static int analyze_time(int argc, char *argv[], void *userdata) { return 0; } -static int verb_log_control(int argc, char *argv[], void *userdata) { - _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; - int r; - - assert(IN_SET(argc, 1, 2)); - - r = acquire_bus(&bus, NULL); - if (r < 0) - return bus_log_connect_error(r, arg_transport); - - return verb_log_control_common(bus, "org.freedesktop.systemd1", argv[0], argc == 2 ? argv[1] : NULL); -} - static bool strv_fnmatch_strv_or_empty(char* const* patterns, char **strv, int flags) { char **s; STRV_FOREACH(s, strv) diff --git a/src/analyze/meson.build b/src/analyze/meson.build index 3f7eb9522ee..022b0749b7c 100644 --- a/src/analyze/meson.build +++ b/src/analyze/meson.build @@ -21,6 +21,8 @@ systemd_analyze_sources = files(''' analyze-exit-status.h analyze-filesystems.c analyze-filesystems.h + analyze-log-control.c + analyze-log-control.h analyze-plot.c analyze-plot.h analyze-security.c