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

varlink: introduce io.systemd.service.GetLogLevel

Browse Source 
We already have io.systemd.service.SetLogLevel. Add a getter so that
CLI tools with `log-level` subcommands can be more easily implemented
with varlink.

Bind this method to all services that already bind io.systemd.service.SetLogLevel.
This commit is contained in:
Nick Rosbrook
2026-08-24 11:54:44 -04:00
parent ffb861ef22
commit 0420097525
12 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/home/homed-manager.c
+1
View File
@@ -1084,6 +1084,7 @@ static int manager_bind_varlink(Manager *m) {
"io.systemd.UserDatabase.GetMemberships", vl_method_get_memberships,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return log_error_errno(r, "Failed to register varlink methods: %m");
src/hostname/hostnamed.c
+1
View File
@@ -2634,6 +2634,7 @@ static int connect_varlink(Context *c) {
"io.systemd.Hostname.SetTags", vl_method_set_tags,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return log_error_errno(r, "Failed to bind Varlink method calls: %m");
src/import/importd.c
+1
View File
@@ -2024,6 +2024,7 @@ static int manager_connect_varlink(Manager *m) {
"io.systemd.Import.Pull", vl_method_pull,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return log_error_errno(r, "Failed to bind Varlink method calls: %m");
src/journal/journald-varlink.c
+1
View File
@@ -206,6 +206,7 @@ int manager_open_varlink(Manager *m, const char *socket, int fd) {
"io.systemd.Journal.RelinquishVar", vl_method_relinquish_var,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return r;
src/login/logind-varlink.c
+1
View File
@@ -903,6 +903,7 @@ int manager_varlink_init(Manager *m, int fd) {
"io.systemd.Shutdown.SoftReboot", vl_method_soft_reboot,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return log_error_errno(r, "Failed to register varlink methods: %m");
src/machine/machined-varlink.c
+1
View File
@@ -838,6 +838,7 @@ static int manager_varlink_init_machine(Manager *m) {
"io.systemd.MachineImage.CleanPool", vl_method_clean_pool,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return log_error_errno(r, "Failed to register varlink methods: %m");
src/network/networkd-manager-varlink.c
+1
View File
@@ -331,6 +331,7 @@ int manager_varlink_init(Manager *m, int fd) {
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.Reload", vl_method_reload,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return log_error_errno(r, "Failed to register varlink methods: %m");
src/oom/oomd-manager.c
+1
View File
@@ -1279,6 +1279,7 @@ static int manager_varlink_init(Manager *m, int fd) {
"io.systemd.oom.ReportManagedOOMCGroups", process_managed_oom_request,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment);
if (r < 0)
return log_error_errno(r, "Failed to register varlink methods: %m");
src/resolve/resolved-varlink.c
+1
View File
@@ -1547,6 +1547,7 @@ static int varlink_main_server_init(Manager *m) {
"io.systemd.Resolve.ResolveRecord", vl_method_resolve_record,
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.SetLogLevel", varlink_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment,
"io.systemd.Resolve.BrowseServices", vl_method_browse_services,
"io.systemd.Resolve.DumpDNSConfiguration", vl_method_dump_dns_configuration);
src/shared/varlink-io.systemd.service.c
+22
View File
@@ -21,6 +21,11 @@ static SD_VARLINK_DEFINE_METHOD(
SD_VARLINK_FIELD_COMMENT("The maximum log level, using BSD syslog log level integers."),
SD_VARLINK_DEFINE_INPUT(level, SD_VARLINK_INT, SD_VARLINK_NULLABLE));
static SD_VARLINK_DEFINE_METHOD(
GetLogLevel,
SD_VARLINK_FIELD_COMMENT("The current maximum log level, using BSD syslog level integers."),
SD_VARLINK_DEFINE_OUTPUT(level, SD_VARLINK_INT, 0));
static SD_VARLINK_DEFINE_METHOD(
GetEnvironment,
SD_VARLINK_FIELD_COMMENT("Returns the current environment block, i.e. the contents of environ[]."),
@@ -39,6 +44,8 @@ SD_VARLINK_DEFINE_INTERFACE(
&vl_method_Reload,
SD_VARLINK_SYMBOL_COMMENT("Sets the maximum log level."),
&vl_method_SetLogLevel,
SD_VARLINK_SYMBOL_COMMENT("Gets the maximum log level."),
&vl_method_GetLogLevel,
SD_VARLINK_SYMBOL_COMMENT("Get current environment block."),
&vl_method_GetEnvironment,
SD_VARLINK_SYMBOL_COMMENT("Returned if the environment block is currently not in a valid state."),
@@ -91,6 +98,21 @@ int varlink_method_set_log_level(sd_varlink *link, sd_json_variant *parameters,
return sd_varlink_reply(link, NULL);
}
int varlink_method_get_log_level(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
int r;
assert(link);
assert(parameters);
r = sd_varlink_dispatch(link, parameters, /* dispatch_table= */ NULL, /* userdata= */ NULL);
if (r != 0)
return r;
log_debug("Received io.systemd.service.GetLogLevel()");
return sd_varlink_replybo(link, SD_JSON_BUILD_PAIR_INTEGER("level", log_get_max_level()));
}
int varlink_method_get_environment(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
uid_t uid;
int r;
src/shared/varlink-io.systemd.service.h
+1
View File
@@ -8,4 +8,5 @@ extern const sd_varlink_interface vl_interface_io_systemd_service;
int varlink_method_ping(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
int varlink_method_set_log_level(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
int varlink_method_get_log_level(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
int varlink_method_get_environment(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
src/udev/udev-varlink.c
+1
View File
@@ -218,6 +218,7 @@ int manager_start_varlink_server(Manager *manager, int fd) {
"io.systemd.service.Ping", varlink_method_ping,
"io.systemd.service.Reload", vl_method_reload,
"io.systemd.service.SetLogLevel", vl_method_set_log_level,
"io.systemd.service.GetLogLevel", varlink_method_get_log_level,
"io.systemd.service.GetEnvironment", varlink_method_get_environment,
"io.systemd.Udev.SetTrace", vl_method_set_trace,
"io.systemd.Udev.SetChildrenMax", vl_method_set_children_max,