From 032bf2da46748e2c05ac154b46490c60f08bd6da Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 30 Jan 2024 11:14:42 +0100 Subject: [PATCH 1/4] sleep: add mising error message --- src/sleep/sleep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 31dca446f2..6864f631f1 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -233,7 +233,7 @@ static int execute( /* This file is opened first, so that if we hit an error, we can abort before modifying any state. */ state_fd = open("/sys/power/state", O_WRONLY|O_CLOEXEC); if (state_fd < 0) - return -errno; + return log_error_errno(errno, "Failed to open /sys/power/state: %m"); /* Configure hibernation settings if we are supposed to hibernate */ if (sleep_operation_is_hibernation(operation)) { From b782080b7aabe0e214c3ee1dca44377a90202e82 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 30 Jan 2024 11:31:56 +0100 Subject: [PATCH 2/4] sleep: remove redundant debug log message --- src/sleep/sleep.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 6864f631f1..8498d45f1a 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -427,15 +427,13 @@ static int custom_timer_suspend(const SleepConfig *sleep_config) { if (r < 0) log_warning_errno(r, "Failed to estimate and update battery discharge rate, ignoring: %m"); } else - log_debug("System woke up too early to estimate discharge rate"); + log_debug("System woke up too early to estimate discharge rate."); if (!woken_by_timer) /* Return as manual wakeup done. This also will return in case battery was charged during suspension */ return 0; r = check_wakeup_type(); - if (r < 0) - log_debug_errno(r, "Failed to check hardware wakeup type, ignoring: %m"); if (r > 0) { log_debug("wakeup type is APM timer"); /* system should hibernate */ From 75d2752814f39f2188c4506eb84ca02586646e9a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 30 Jan 2024 11:32:41 +0100 Subject: [PATCH 3/4] sleep: upgrade some unexpected errors to LOG_WARNING log messages --- src/sleep/sleep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 8498d45f1a..75adedc0e6 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -474,18 +474,18 @@ static int execute_s2h(const SleepConfig *sleep_config) { r = freeze_thaw_user_slice(&(const char*) { "FreezeUnit" }); if (r < 0) - log_debug_errno(r, "Failed to freeze unit user.slice, ignoring: %m"); + log_warning_errno(r, "Failed to freeze unit user.slice, ignoring: %m"); /* Only check if we have automated battery alarms if HibernateDelaySec= is not set, as in that case * we'll busy poll for the configured interval instead */ if (!timestamp_is_set(sleep_config->hibernate_delay_usec)) { r = check_wakeup_type(); if (r < 0) - log_debug_errno(r, "Failed to check hardware wakeup type, ignoring: %m"); + log_warning_errno(r, "Failed to check hardware wakeup type, ignoring: %m"); else { r = battery_trip_point_alarm_exists(); if (r < 0) - log_debug_errno(r, "Failed to check whether acpi_btp support is enabled or not, ignoring: %m"); + log_warning_errno(r, "Failed to check whether acpi_btp support is enabled or not, ignoring: %m"); } } else r = 0; /* Force fallback path */ From e7be86519dc36bcf0ed9e82a93fd4c1ac6a4cda8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 30 Jan 2024 11:32:56 +0100 Subject: [PATCH 4/4] sleep: upgrade fatal log message to LOG_ERR --- src/sleep/sleep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 75adedc0e6..f1b6f1bcdc 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -498,7 +498,7 @@ static int execute_s2h(const SleepConfig *sleep_config) { r = check_wakeup_type(); if (r < 0) - return log_debug_errno(r, "Failed to check hardware wakeup type: %m"); + return log_error_errno(r, "Failed to check hardware wakeup type: %m"); if (r == 0) /* For APM Timer wakeup, system should hibernate else wakeup */