colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: update activation request logging

Browse Source
This commit is contained in:
Dan Williams
2010-04-07 11:36:38 -07:00
parent ce8631eea2
commit acf8f7f531
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nm-activation-request.c
View File

@@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2005 - 2008 Red Hat, Inc. * Copyright (C) 2005 - 2010 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc. * Copyright (C) 2007 - 2008 Novell, Inc.
*/ */
@@ -27,7 +27,7 @@
#include "nm-activation-request.h" #include "nm-activation-request.h"
#include "nm-marshal.h" #include "nm-marshal.h"
#include "nm-utils.h" #include "nm-logging.h"
#include "nm-setting-wireless-security.h" #include "nm-setting-wireless-security.h"
#include "nm-setting-8021x.h" #include "nm-setting-8021x.h"
#include "nm-dbus-manager.h" #include "nm-dbus-manager.h"
@@ -418,7 +418,7 @@ secrets_update_setting (NMSecretsProviderInterface *interface,
nm_connection_add_setting (priv->connection, setting); nm_connection_add_setting (priv->connection, setting);
else { else {
if (!nm_connection_update_secrets (priv->connection, setting_name, new, &error)) { if (!nm_connection_update_secrets (priv->connection, setting_name, new, &error)) {
nm_warning ("Failed to update connection secrets: %d %s", nm_log_warn (LOGD_DEVICE, "Failed to update connection secrets: %d %s",
error ? error->code : -1, error ? error->code : -1,
error && error->message ? error->message : "(none)"); error && error->message ? error->message : "(none)");
g_clear_error (&error); g_clear_error (&error);
@@ -591,15 +591,17 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared)
int status; int status;
GError *error = NULL; GError *error = NULL;
nm_info ("Executing: %s", cmd); nm_log_info (LOGD_SHARING, "Executing: %s", cmd);
if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
share_child_setup, NULL, NULL, NULL, &status, &error)) { share_child_setup, NULL, NULL, NULL, &status, &error)) {
nm_info ("Error executing command: (%d) %s", nm_log_warn (LOGD_SHARING, "Error executing command: (%d) %s",
error ? error->code : -1, error ? error->code : -1,
(error && error->message) ? error->message : "(unknown)"); (error && error->message) ? error->message : "(unknown)");
g_clear_error (&error); g_clear_error (&error);
} else if (WEXITSTATUS (status)) } else if (WEXITSTATUS (status)) {
nm_info ("** Command returned exit status %d.", WEXITSTATUS (status)); nm_log_warn (LOGD_SHARING, "** Command returned exit status %d.",
WEXITSTATUS (status));
}
} }
g_free (cmd); g_free (cmd);
if (argv) if (argv)