wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-03 13:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

plugins: reduce log level LOG_ERR -> LOG_WARNING

Browse Source 
These plugins signal success and failure directly to the console, the
user should inspect syslog for more information.

This change is a follow-up to 340cae4, where kernel logs of LOG_ERR and
higher are allowed to log directly to the console.  Since syslogd has
not been started before these plugins, the log messages would otherwise
leak to the console.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2024-11-04 10:42:45 +01:00
1 parent 6be16f2f6d
commit 49c0557ced
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

plugins/rtc.c
+7 -7
View File
@@ -147,7 +147,7 @@ static void file_save(void *arg)
} }
if ((rc = time_get(&tm))) { if ((rc = time_get(&tm))) {
logit(LOG_ERR, "System clock invalid, before %s, not saving", rtc_timestamp); logit(LOG_WARNING, "System clock invalid, before %s, not saving", rtc_timestamp);
print_desc(NULL, "System clock invalid, skipping"); print_desc(NULL, "System clock invalid, skipping");
} else { } else {
char buf[32] = { 0 }; char buf[32] = { 0 };
@@ -238,7 +238,7 @@ static void rtc_save(void *arg)
} }
if (rc && errno == EINVAL) { if (rc && errno == EINVAL) {
logit(LOG_ERR, "System clock invalid, before %s, not saving to RTC", rtc_timestamp); logit(LOG_WARNING, "System clock invalid, before %s, not saving to RTC", rtc_timestamp);
rc = 2; rc = 2;
} }
@@ -275,13 +275,13 @@ static void rtc_restore(void *arg)
} }
if (rc) { if (rc) {
logit(LOG_ERR, "Failed restoring system clock from RTC."); logit(LOG_WARNING, "Failed restoring system clock from RTC.");
if (EINVAL == errno) if (EINVAL == errno)
logit(LOG_ERR, "RTC time is too old (before %s)", rtc_timestamp); logit(LOG_WARNING, "RTC time is too old (before %s)", rtc_timestamp);
else if (ENOENT == errno) else if (ENOENT == errno)
logit(LOG_ERR, "RTC has no previously saved (valid) time."); logit(LOG_WARNING, "RTC has no previously saved (valid) time.");
else else
logit(LOG_ERR, "RTC error code %d: %s", errno, strerror(errno)); logit(LOG_WARNING, "RTC error code %d: %s", errno, strerror(errno));
print(2, NULL); print(2, NULL);
@@ -322,7 +322,7 @@ PLUGIN_INIT(plugin_init)
struct tm tm = { 0 }; struct tm tm = { 0 };
if (!strptime(rtc_timestamp, RTC_FMT, &tm)) { if (!strptime(rtc_timestamp, RTC_FMT, &tm)) {
logit(LOG_ERR, "Invalid restore date '%s', reverting to '%s'", logit(LOG_WARNING, "Invalid restore date '%s', reverting to '%s'",
rtc_timestamp, RTC_TIMESTAMP_BEGIN_2000); rtc_timestamp, RTC_TIMESTAMP_BEGIN_2000);
rtc_timestamp = RTC_TIMESTAMP_BEGIN_2000; rtc_timestamp = RTC_TIMESTAMP_BEGIN_2000;
} else } else
plugins/urandom.c
+1 -1
View File
@@ -154,7 +154,7 @@ static void setup(void *arg)
close(fd); close(fd);
free(rpi); free(rpi);
if (rc < 0) if (rc < 0)
logit(LOG_ERR, "Failed adding entropy to kernel random pool: %s", strerror(err)); logit(LOG_WARNING, "Failed adding entropy to kernel random pool: %s", strerror(err));
print_result(rc < 0); print_result(rc < 0);
return; return;
fallback: fallback: