system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 20:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

logging: tweak logging-enabled functions

Browse source 
Rather than having separate nm_logging_level_enabled() and
nm_logging_domain_enabled(), have just nm_logging_enabled() that
checks both.
This commit is contained in:
Dan Winship 2013-10-01 11:08:31 -04:00
parent bfcf402525
commit 0e3432fbea
9 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/nm-device-team.c
View file

@ -549,7 +549,7 @@ teamd_start (NMDevice *dev, NMSettingTeam *s_team, NMDeviceTeamPrivate *priv)
g_ptr_array_add (argv, (gpointer) config);
}
if (nm_logging_level_enabled (LOGL_DEBUG))
if (nm_logging_enabled (LOGL_DEBUG, LOGD_TEAM))
g_ptr_array_add (argv, (gpointer) "-gg");
g_ptr_array_add (argv, NULL);

2
src/devices/nm-device-wifi.c
View file

@ -1633,7 +1633,7 @@ request_wireless_scan (gpointer user_data)
ssids = build_hidden_probe_list (self);
if (nm_logging_level_enabled (LOGL_DEBUG)) {
if (nm_logging_enabled (LOGL_DEBUG, LOGD_WIFI_SCAN)) {
if (ssids) {
guint i;
char *foo;

4
src/devices/nm-device.c
View file

@ -2480,7 +2480,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason)
argv[i++] = "--script";
argv[i++] = (char *) nm_device_autoipd_helper_path;
if (nm_logging_level_enabled (LOGL_DEBUG))
if (nm_logging_enabled (LOGL_DEBUG, LOGD_AUTOIP4))
argv[i++] = "--debug";
argv[i++] = (char *) nm_device_get_ip_iface (self);
argv[i++] = NULL;
@ -5047,7 +5047,7 @@ spawn_ping (NMDevice *self,
args[6] = str_timeout = g_strdup_printf ("%u", timeout);
if (nm_logging_level_enabled (LOGL_DEBUG)) {
if (nm_logging_enabled (LOGL_DEBUG, log_domain)) {
cmd = g_strjoinv (" ", (gchar **) args);
nm_log_dbg (log_domain, "(%s): running '%s'",
nm_device_get_iface (self),

4
src/dhcp-manager/nm-dhcp-client.c
View file

@ -431,7 +431,7 @@ get_duid (NMDHCPClient *self)
duid = generate_duid_from_machine_id ();
g_assert (duid);
if (nm_logging_level_enabled (LOGL_DEBUG)) {
if (nm_logging_enabled (LOGL_DEBUG, LOGD_DHCP6)) {
escaped = escape_duid (duid);
nm_log_dbg (LOGD_DHCP6, "Generated DUID %s", escaped);
g_free (escaped);
@ -469,7 +469,7 @@ nm_dhcp_client_start_ip6 (NMDHCPClient *self,
if (!priv->duid)
priv->duid = NM_DHCP_CLIENT_GET_CLASS (self)->get_duid (self);
if (nm_logging_level_enabled (LOGL_DEBUG)) {
if (nm_logging_enabled (LOGL_DEBUG, LOGD_DHCP)) {
escaped = escape_duid (priv->duid);
nm_log_dbg (LOGD_DHCP, "(%s): DHCPv6 DUID is '%s'", priv->iface, escaped);
g_free (escaped);

10
src/logging/nm-logging.c
View file

@ -281,15 +281,9 @@ nm_logging_all_domains_to_string (void)
}
gboolean
nm_logging_level_enabled (guint32 level)
nm_logging_enabled (guint32 level, guint64 domain)
{
return !!(log_level & level);
}
gboolean
nm_logging_domain_enabled (guint64 domain)
{
return !!(log_domains & domain);
return !!(log_level & level) && !!(log_domains & domain);
}
void

3
src/logging/nm-logging.h
View file

@ -109,8 +109,7 @@ void _nm_log (const char *loc,
const char *nm_logging_level_to_string (void);
char *nm_logging_domains_to_string (void);
gboolean nm_logging_level_enabled (guint32 level);
gboolean nm_logging_domain_enabled (guint64 domain);
gboolean nm_logging_enabled (guint32 level, guint64 domain);
const char *nm_logging_all_levels_to_string (void);
const char *nm_logging_all_domains_to_string (void);

2
src/nm-properties-changed-signal.c
View file

@ -102,7 +102,7 @@ properties_changed (gpointer data)
g_assert (info);
if (nm_logging_level_enabled (LOGL_DEBUG)) {
if (nm_logging_enabled (LOGL_DEBUG, LOGD_DBUS_PROPS)) {
GString *buf = g_string_new (NULL);
g_hash_table_foreach (info->hash, add_to_string, buf);

3
src/ppp-manager/nm-ppp-manager.c
View file

@ -831,8 +831,7 @@ create_pppd_cmd_line (NMPPPManager *self,
nm_cmd_line_add_string (cmd, ",");
ppp_debug = !!getenv ("NM_PPP_DEBUG");
if ( nm_logging_level_enabled (LOGL_DEBUG)
&& nm_logging_domain_enabled (LOGD_PPP))
if (nm_logging_enabled (LOGL_DEBUG, LOGD_PPP))
ppp_debug = TRUE;
if (ppp_debug)

2
src/settings/nm-settings-connection.c
View file

@ -911,7 +911,7 @@ nm_settings_connection_get_secrets (NMSettingsConnection *self,
if (existing_secrets)
g_hash_table_unref (existing_secrets);
if (nm_logging_level_enabled (LOGL_DEBUG)) {
if (nm_logging_enabled (LOGL_DEBUG, LOGD_SETTINGS)) {
if (hints)
joined_hints = g_strjoinv (",", (char **) hints);
nm_log_dbg (LOGD_SETTINGS, "(%s/%s:%u) secrets requested flags 0x%X hints '%s'",