From 60d83c3e866ab32f7e753fe8f1db9f2fb295bf4f Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 10 Aug 2023 00:13:42 +0800 Subject: [PATCH 1/2] battery-util: don't log duplicate message Follow-up for 02f7f8aa4f1d0b7a24ee3cd5685a791771d9ded5 Addresses https://github.com/systemd/systemd/pull/28597#discussion_r1288591215 > this is pretty unnecessary, battery_read_capacity_percentage() debug logs on its own about this already, in more detailed way? --- src/shared/battery-util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shared/battery-util.c b/src/shared/battery-util.c index 8b7bdc704d..cc3835f906 100644 --- a/src/shared/battery-util.c +++ b/src/shared/battery-util.c @@ -224,7 +224,7 @@ int battery_read_capacity_percentage(sd_device *dev) { return log_device_debug_errno(dev, r, "Failed to read/parse POWER_SUPPLY_CAPACITY: %m"); if (battery_capacity < 0 || battery_capacity > 100) - return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ERANGE), "Invalid battery capacity"); + return log_device_debug_errno(dev, SYNTHETIC_ERRNO(ERANGE), "Invalid battery capacity: %d", battery_capacity); return battery_capacity; } @@ -254,7 +254,6 @@ int battery_is_discharging_and_low(void) { level = battery_read_capacity_percentage(dev); if (level < 0) { - log_device_debug_errno(dev, level, "Battery capacity is unreadable: %m"); unsure = true; continue; } From 46b0b7e24ac267cc7322b62814e735c9ae1ad2cb Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Thu, 10 Aug 2023 00:15:29 +0800 Subject: [PATCH 2/2] battery-util: log_notice when unsure about battery state Follow-up for 02f7f8aa4f1d0b7a24ee3cd5685a791771d9ded5 This deserves some highlight. Addresses https://github.com/systemd/systemd/pull/28597#discussion_r1288592726 --- src/shared/battery-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/battery-util.c b/src/shared/battery-util.c index cc3835f906..85cb067c84 100644 --- a/src/shared/battery-util.c +++ b/src/shared/battery-util.c @@ -274,7 +274,7 @@ int battery_is_discharging_and_low(void) { /* If we found a battery whose state we couldn't read, don't assume we are in low battery state */ if (unsure) { - log_info("Found battery with unreadable state, assuming not in low battery state."); + log_notice("Found battery with unreadable state, assuming not in low battery state."); return false; }