fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 21:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: replace deprecated and synchronous nm_client_set_logging()

Browse source 
This is more a showcase for using nm_client_dbus_call(), than a
real use.

In this case, nmcli was mostly fine to just invoke the synchronous API
and not care about the problems that it had.

Still, replace it, and show the suggested alternative.
This commit is contained in:
Thomas Haller 2020-03-14 08:43:01 +01:00
parent 06da903bb6
commit d99d1dc265
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
clients/cli/general.c
View file

@ -731,11 +731,26 @@ nmc_complete_strings_nocase (const char *prefix, ...)
va_end (args);
}
static void
_set_logging_cb (GObject *object, GAsyncResult *result, gpointer user_data)
{
NmCli *nmc = user_data;
gs_unref_variant GVariant *res = NULL;
gs_free_error GError *error = NULL;
res = nm_client_dbus_call_finish (NM_CLIENT (object), result, &error);
if (!res) {
g_dbus_error_strip_remote_error (error);
g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"),
nmc_error_get_simple_message (error));
nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
}
quit ();
}
static NMCResultCode
do_general_logging (NmCli *nmc, int argc, char **argv)
{
gs_free_error GError *error = NULL;
next_arg (nmc, &argc, &argv, NULL);
if (argc == 0) {
if (nmc->complete)
@ -789,12 +804,19 @@ do_general_logging (NmCli *nmc, int argc, char **argv)
if (nmc->complete)
return nmc->return_value;
nm_client_set_logging (nmc->client, level, domains, &error);
if (error) {
g_string_printf (nmc->return_text, _("Error: failed to set logging: %s"),
nmc_error_get_simple_message (error));
return NMC_RESULT_ERROR_UNKNOWN;
}
nmc->should_wait++;
nm_client_dbus_call (nmc->client,
NM_DBUS_PATH,
NM_DBUS_INTERFACE,
"SetLogging",
g_variant_new ("(ss)",
level ?: "",
domains ?: ""),
G_VARIANT_TYPE ("()"),
-1,
NULL,
_set_logging_cb,
nmc);
}
return nmc->return_value;