diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-29 09:42:39 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-11-29 10:15:02 +0100 |
| commit | 199525ba52523be2345e86a8e1da9d63c24e425a (patch) | |
| tree | 2406686c91d2c4e195fd387aa4b65da35c02c664 /src/nm-manager.c | |
| parent | 88549b031a59925312825b5f051c40a37420347b (diff) | |
core: avoid duplicate <info> logging message when sleeping/waking
<debug> [1511941494.1809] manager: Received resuming signal
<info> [1511941494.1809] manager: wake requested (sleeping: yes enabled: yes)
<info> [1511941494.1809] manager: waking up...
Diffstat (limited to 'src/nm-manager.c')
| -rw-r--r-- | src/nm-manager.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 8329ff156..202e80fe2 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4490,7 +4490,7 @@ do_sleep_wake (NMManager *self, gboolean sleeping_changed) waking_from_suspend = sleeping_changed && !priv->sleeping; if (manager_sleeping (self)) { - _LOGI (LOGD_SUSPEND, "%s...", suspending ? "sleeping" : "disabling"); + _LOGD (LOGD_SUSPEND, "sleep: %s...", suspending ? "sleeping" : "disabling"); /* FIXME: are there still hardware devices that need to be disabled around * suspend/resume? @@ -4521,7 +4521,7 @@ do_sleep_wake (NMManager *self, gboolean sleeping_changed) } } } else { - _LOGI (LOGD_SUSPEND, "%s...", waking_from_suspend ? "waking up" : "re-enabling"); + _LOGD (LOGD_SUSPEND, "sleep: %s...", waking_from_suspend ? "waking up" : "re-enabling"); if (waking_from_suspend) { sleep_devices_clear (self); @@ -4578,7 +4578,6 @@ do_sleep_wake (NMManager *self, gboolean sleeping_changed) enabled ? "enabling" : "disabling", rstate->desc, rstate->hw_enabled, rstate->sw_enabled, rstate->user_enabled); } - if (nm_device_get_rfkill_type (device) == rstate->rtype) nm_device_set_enabled (device, enabled); } @@ -4602,7 +4601,7 @@ _internal_sleep (NMManager *self, gboolean do_sleep) if (priv->sleeping == do_sleep) return; - _LOGI (LOGD_SUSPEND, "%s requested (sleeping: %s enabled: %s)", + _LOGI (LOGD_SUSPEND, "sleep: %s requested (sleeping: %s enabled: %s)", do_sleep ? "sleep" : "wake", priv->sleeping ? "yes" : "no", priv->net_enabled ? "yes" : "no"); @@ -4714,7 +4713,7 @@ sleeping_cb (NMSleepMonitor *monitor, gboolean is_about_to_suspend, gpointer use { NMManager *self = user_data; - _LOGD (LOGD_SUSPEND, "Received %s signal", is_about_to_suspend ? "sleeping" : "resuming"); + _LOGT (LOGD_SUSPEND, "sleep: received %s signal", is_about_to_suspend ? "sleeping" : "resuming"); _internal_sleep (self, is_about_to_suspend); } |