From b7288577fe4249304cc0a77ce4862cf1791b8b59 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 6 Apr 2010 16:41:12 -0700 Subject: [PATCH] logging: update modem-manager logging --- src/modem-manager/nm-modem-cdma.c | 16 ++++----- src/modem-manager/nm-modem-gsm.c | 22 ++++++------ src/modem-manager/nm-modem-manager.c | 36 +++++++++---------- src/modem-manager/nm-modem.c | 53 ++++++++++++++-------------- 4 files changed, 64 insertions(+), 63 deletions(-) diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c index f2a04dc076..c32c18222c 100644 --- a/src/modem-manager/nm-modem-cdma.c +++ b/src/modem-manager/nm-modem-cdma.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009 - 2010 Red Hat, Inc. * Copyright (C) 2009 Novell, Inc. */ @@ -28,8 +28,8 @@ #include "nm-dbus-manager.h" #include "nm-setting-connection.h" #include "nm-setting-cdma.h" -#include "nm-utils.h" #include "NetworkManagerUtils.h" +#include "nm-logging.h" G_DEFINE_TYPE (NMModemCdma, nm_modem_cdma, NM_TYPE_MODEM) @@ -119,9 +119,9 @@ stage1_prepare_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data if (dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID)) g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, TRUE, NM_DEVICE_STATE_REASON_NONE); else { - nm_warning ("CDMA connection failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_MB, "CDMA connection failed: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); g_error_free (error); g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, NM_DEVICE_STATE_REASON_NONE); } @@ -150,9 +150,9 @@ stage1_enable_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_da if (dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) do_connect (self); else { - nm_warning ("CDMA modem enable failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_MB, "CDMA modem enable failed: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); g_error_free (error); g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED); } diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c index 152b2a6a9c..abb96db1fd 100644 --- a/src/modem-manager/nm-modem-gsm.c +++ b/src/modem-manager/nm-modem-gsm.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009 - 2010 Red Hat, Inc. * Copyright (C) 2009 Novell, Inc. */ @@ -26,7 +26,7 @@ #include "nm-setting-connection.h" #include "nm-setting-gsm.h" #include "nm-modem-types.h" -#include "nm-utils.h" +#include "nm-logging.h" #include "NetworkManagerUtils.h" typedef enum { @@ -207,9 +207,9 @@ stage1_prepare_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data else if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_WRONG)) ask_for_pin (self, TRUE); else { - nm_warning ("GSM connection failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_MB, "GSM connection failed: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error)); } @@ -260,9 +260,9 @@ stage1_pin_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data) /* Success; go back and try the enable again */ do_enable (self); } else { - nm_warning ("GSM PIN unlock failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_MB, "GSM PIN unlock failed: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); g_error_free (error); g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED); @@ -303,9 +303,9 @@ stage1_enable_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_da if (dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) do_connect (self); else { - nm_warning ("GSM modem enable failed: (%d) %s", - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_MB, "GSM modem enable failed: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_PIN)) handle_enable_pin_required (self); diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c index 6a7de07ef9..28f7b94d0c 100644 --- a/src/modem-manager/nm-modem-manager.c +++ b/src/modem-manager/nm-modem-manager.c @@ -15,18 +15,18 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009 - 2010 Red Hat, Inc. * Copyright (C) 2009 Novell, Inc. * Copyright (C) 2009 Canonical Ltd. */ #include #include "nm-modem-manager.h" +#include "nm-logging.h" #include "nm-modem.h" #include "nm-modem-gsm.h" #include "nm-modem-cdma.h" #include "nm-dbus-manager.h" -#include "nm-utils.h" #include "nm-modem-types.h" #include "nm-marshal.h" @@ -95,7 +95,7 @@ get_modem_properties (DBusGConnection *connection, *type = g_value_get_uint (&value); g_value_unset (&value); } else { - g_warning ("Could not get device type: %s", err->message); + nm_log_warn (LOGD_MB, "could not get device type: %s", err->message); goto out; } @@ -108,7 +108,7 @@ get_modem_properties (DBusGConnection *connection, *device = g_value_dup_string (&value); g_value_unset (&value); } else { - g_warning ("Could not get device: %s", err->message); + nm_log_warn (LOGD_MB, "could not get device: %s", err->message); goto out; } @@ -121,7 +121,7 @@ get_modem_properties (DBusGConnection *connection, *ip_method = g_value_get_uint (&value); g_value_unset (&value); } else { - g_warning ("Could not get IP method: %s", err->message); + nm_log_warn (LOGD_MB, "could not get IP method: %s", err->message); goto out; } @@ -134,7 +134,7 @@ get_modem_properties (DBusGConnection *connection, *data_device = g_value_dup_string (&value); g_value_unset (&value); } else { - g_warning ("Could not get modem data device: %s", err->message); + nm_log_warn (LOGD_MB, "could not get modem data device: %s", err->message); goto out; } @@ -147,7 +147,7 @@ get_modem_properties (DBusGConnection *connection, *driver = g_value_dup_string (&value); g_value_unset (&value); } else { - g_warning ("Could not get modem driver: %s", err->message); + nm_log_warn (LOGD_MB, "could not get modem driver: %s", err->message); goto out; } @@ -164,13 +164,13 @@ static void create_modem (NMModemManager *manager, const char *path) { NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (manager); - NMModem *modem; + NMModem *modem = NULL; char *data_device = NULL, *driver = NULL, *master_device = NULL; uint modem_type = MM_MODEM_TYPE_UNKNOWN; uint ip_method = MM_MODEM_IP_METHOD_PPP; if (g_hash_table_lookup (priv->modems, path)) { - nm_warning ("Modem with path %s already exists, ignoring", path); + nm_log_warn (LOGD_MB, "modem with path %s already exists, ignoring", path); return; } @@ -180,22 +180,22 @@ create_modem (NMModemManager *manager, const char *path) return; if (modem_type == MM_MODEM_TYPE_UNKNOWN) { - nm_warning ("Modem with path %s has unknown type, ignoring", path); + nm_log_warn (LOGD_MB, "modem with path %s has unknown type, ignoring", path); return; } if (!master_device || !strlen (master_device)) { - nm_warning ("Modem with path %s has unknown device, ignoring", path); + nm_log_warn (LOGD_MB, "modem with path %s has unknown device, ignoring", path); return; } if (!driver || !strlen (driver)) { - nm_warning ("Modem with path %s has unknown driver, ignoring", path); + nm_log_warn (LOGD_MB, "modem with path %s has unknown driver, ignoring", path); return; } if (!data_device || !strlen (data_device)) { - nm_warning ("Modem with path %s has unknown data device, ignoring", path); + nm_log_warn (LOGD_MB, "modem with path %s has unknown data device, ignoring", path); return; } @@ -204,7 +204,7 @@ create_modem (NMModemManager *manager, const char *path) else if (modem_type == MM_MODEM_TYPE_CDMA) modem = nm_modem_cdma_new (path, master_device, data_device, ip_method); else - g_error ("Invalid modem type"); + nm_log_warn (LOGD_MB, "unknown modem type '%d'", modem_type); g_free (data_device); @@ -265,7 +265,7 @@ enumerate_devices_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer dat if (!dbus_g_proxy_end_call (proxy, call_id, &error, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &modems, G_TYPE_INVALID)) { - nm_warning ("Could not get modem list: %s", error->message); + nm_log_warn (LOGD_MB, "could not get modem list: %s", error->message); g_error_free (error); } else { int i; @@ -291,7 +291,7 @@ modem_manager_appeared (NMModemManager *self, gboolean enumerate_devices) priv->poke_id = 0; } - nm_info ("modem-manager is now available"); + nm_log_info (LOGD_MB, "modem-manager is now available"); priv->proxy = dbus_g_proxy_new_for_name (nm_dbus_manager_get_connection (priv->dbus_mgr), MM_DBUS_SERVICE, MM_DBUS_PATH, MM_DBUS_INTERFACE); @@ -331,7 +331,7 @@ modem_manager_disappeared (NMModemManager *self) } /* Try to activate the modem-manager */ - nm_info ("Trying to start the modem-manager..."); + nm_log_info (LOGD_MB, "trying to start the modem manager..."); poke_modem_cb (self); priv->poke_id = g_timeout_add_seconds (MODEM_POKE_INTERVAL, poke_modem_cb, self); } @@ -356,7 +356,7 @@ nm_modem_manager_name_owner_changed (NMDBusManager *dbus_mgr, if (!old_owner_good && new_owner_good) { modem_manager_appeared (NM_MODEM_MANAGER (user_data), FALSE); } else if (old_owner_good && !new_owner_good) { - nm_info ("modem manager disappeared"); + nm_log_info (LOGD_MB, "the modem manager disappeared"); modem_manager_disappeared (NM_MODEM_MANAGER (user_data)); } } diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 4ce4c9ee48..d9413edf28 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009 - 2010 Red Hat, Inc. * Copyright (C) 2009 Novell, Inc. */ @@ -27,7 +27,7 @@ #include "nm-marshal.h" #include "nm-properties-changed-signal.h" #include "nm-modem-types.h" -#include "nm-utils.h" +#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-device-interface.h" @@ -203,6 +203,7 @@ ppp_ip4_config (NMPPPManager *ppp_manager, } if (!num || dns_workaround) { + nm_log_warn (LOGD_PPP, "compensating for invalid PPP-provided nameservers"); nm_ip4_config_reset_nameservers (config); nm_ip4_config_add_nameserver (config, good_dns1); nm_ip4_config_add_nameserver (config, good_dns2); @@ -267,8 +268,7 @@ ppp_stage3_ip4_config_start (NMModem *self, ret = NM_ACT_STAGE_RETURN_POSTPONE; } else { - nm_warning ("%s: error starting PPP: (%d) %s", - __func__, + nm_log_err (LOGD_PPP, "error starting PPP: (%d) %s", error ? error->code : -1, error && error->message ? error->message : "(unknown)"); g_error_free (error); @@ -398,6 +398,7 @@ nm_modem_stage3_ip4_config_start (NMModem *self, NMDeviceClass *device_class, NMDeviceStateReason *reason) { + NMModemPrivate *priv; NMActRequest *req; NMActStageReturn ret; @@ -412,7 +413,8 @@ nm_modem_stage3_ip4_config_start (NMModem *self, req = nm_device_get_act_request (device); g_assert (req); - switch (NM_MODEM_GET_PRIVATE (self)->ip_method) { + priv = NM_MODEM_GET_PRIVATE (self); + switch (priv->ip_method) { case MM_MODEM_IP_METHOD_PPP: ret = ppp_stage3_ip4_config_start (self, req, reason); break; @@ -423,7 +425,7 @@ nm_modem_stage3_ip4_config_start (NMModem *self, ret = device_class->act_stage3_ip4_config_start (device, reason); break; default: - g_warning ("Invalid IP method"); + nm_log_err (LOGD_MB, "unknown IP method %d", priv->ip_method); ret = NM_ACT_STAGE_RETURN_FAILURE; break; } @@ -438,6 +440,7 @@ nm_modem_stage4_get_ip4_config (NMModem *self, NMIP4Config **config, NMDeviceStateReason *reason) { + NMModemPrivate *priv; NMActRequest *req; NMActStageReturn ret; @@ -452,7 +455,8 @@ nm_modem_stage4_get_ip4_config (NMModem *self, req = nm_device_get_act_request (device); g_assert (req); - switch (NM_MODEM_GET_PRIVATE (self)->ip_method) { + priv = NM_MODEM_GET_PRIVATE (self); + switch (priv->ip_method) { case MM_MODEM_IP_METHOD_PPP: ret = ppp_stage4 (self, req, config, reason); break; @@ -463,7 +467,7 @@ nm_modem_stage4_get_ip4_config (NMModem *self, ret = device_class->act_stage4_get_ip4_config (device, config, reason); break; default: - g_warning ("Invalid IP method"); + nm_log_err (LOGD_MB, "unknown IP method %d", priv->ip_method); ret = NM_ACT_STAGE_RETURN_FAILURE; break; } @@ -526,7 +530,7 @@ nm_modem_connection_secrets_updated (NMModem *self, if (!strcmp (candidate_setting_name, setting_name)) found = TRUE; else { - nm_warning ("Ignoring updated secrets for setting '%s'.", + nm_log_warn (LOGD_MB, "ignoring updated secrets for setting '%s'.", candidate_setting_name); } } @@ -662,7 +666,7 @@ real_deactivate_quickly (NMModem *self, NMDevice *device) nm_system_device_set_up_down_with_iface (iface, FALSE, NULL); break; default: - g_warning ("Invalid IP method"); + nm_log_err (LOGD_MB, "unknown IP method %d", priv->ip_method); break; } } @@ -679,10 +683,9 @@ disconnect_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data) GError *error = NULL; if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { - g_warning ("%s: disconnect failed: (%d) %s", - __func__, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_info (LOGD_MB, "disconnect failed: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); } } @@ -786,10 +789,9 @@ get_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_d if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - g_warning ("%s: failed get modem enabled state: (%d) %s", - __func__, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_MB, "failed get modem enabled state: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); return; } @@ -797,7 +799,7 @@ get_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_d NM_MODEM_GET_PRIVATE (self)->mm_enabled = g_value_get_boolean (&value); g_object_notify (G_OBJECT (self), NM_MODEM_ENABLED); } else - g_warning ("%s: failed get modem enabled state: unexpected reply type", __func__); + nm_log_warn (LOGD_MB, "failed get modem enabled state: unexpected reply type"); g_value_unset (&value); } @@ -819,10 +821,9 @@ set_mm_enabled_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_d GError *error = NULL; if (!dbus_g_proxy_end_call (proxy, call_id, &error, G_TYPE_INVALID)) { - g_warning ("%s: failed to enable/disable modem: (%d) %s", - __func__, - error ? error->code : -1, - error && error->message ? error->message : "(unknown)"); + nm_log_warn (LOGD_MB, "failed to enable/disable modem: (%d) %s", + error ? error->code : -1, + error && error->message ? error->message : "(unknown)"); } /* Update enabled/disabled state again */ @@ -904,17 +905,17 @@ constructor (GType type, priv = NM_MODEM_GET_PRIVATE (object); if (!priv->device) { - g_warning ("Modem parent device not provided"); + nm_log_err (LOGD_HW, "modem parent device not provided"); goto err; } if (!priv->device) { - g_warning ("Modem command interface not provided"); + nm_log_err (LOGD_HW, "modem command interface not provided"); goto err; } if (!priv->path) { - g_warning ("DBus path not provided"); + nm_log_err (LOGD_HW, "D-Bus path not provided"); goto err; }