daemon-util: introduce notify_remove_fd()

It is equivalent to notify_remove_fd_warn() but logs in debug level on
failure.
This commit is contained in:
Yu Watanabe
2026-01-05 07:24:54 +09:00
parent fd8a1deb0b
commit 36c557f7d4
2 changed files with 14 additions and 4 deletions
+13 -4
View File
@@ -9,7 +9,7 @@
#include "string-util.h"
#include "time-util.h"
int notify_remove_fd_warn(const char *name) {
static int notify_remove_fd_full(int log_level, const char *name) {
int r;
assert(name);
@@ -18,13 +18,22 @@ int notify_remove_fd_warn(const char *name) {
"FDSTOREREMOVE=1\n"
"FDNAME=%s", name);
if (r < 0)
return log_warning_errno(r,
"Failed to remove file descriptor \"%s\" from the store, ignoring: %m",
name);
return log_full_errno(
log_level, r,
"Failed to remove file descriptor \"%s\" from the store, ignoring: %m",
name);
return 0;
}
int notify_remove_fd(const char *name) {
return notify_remove_fd_full(LOG_DEBUG, name);
}
int notify_remove_fd_warn(const char *name) {
return notify_remove_fd_full(LOG_WARNING, name);
}
int notify_remove_fd_warnf(const char *format, ...) {
_cleanup_free_ char *p = NULL;
va_list ap;
+1
View File
@@ -21,6 +21,7 @@ static inline void notify_on_cleanup(const char **p) {
(void) sd_notify(false, *p);
}
int notify_remove_fd(const char *name);
int notify_remove_fd_warn(const char *name);
int notify_remove_fd_warnf(const char *format, ...) _printf_(1, 2);
int close_and_notify_warn(int fd, const char *name);