Yu Watanabe
1f3b407307
This partially reverts36c557f7d4, which introduced notify_remove_fd() that logs in LOG_DEBUG. However, notify_remove_fd_warn() is still called other library functions, e.g. notify_push_fd(), and produces warning message about the failure in removing fd from fdstore on shutdown. During shutdown process, we get the following logs: ``` systemd-udevd[370]: Failed to send notify message to '/run/systemd/notify': Connection refused systemd-udevd[370]: Failed to remove file descriptor "config-serialization" from the store, ignoring: Connection refused systemd-udevd[370]: Failed to send notify message to '/run/systemd/notify': Connection refused systemd-udevd[370]: Failed to push serialization fd to service manager: Connection refused ``` Here, the 1st, 3rd, and 4th messages are in LOG_DEBUG, but the 2nd one was in LOG_WARNING before this commit, and this makes it also in LOG_DEBUG. Follow-up for472404aca5.
34 lines
1.1 KiB
C
34 lines
1.1 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
#pragma once
|
|
|
|
#include "sd-daemon.h" /* IWYU pragma: export */
|
|
|
|
#include "shared-forward.h"
|
|
|
|
#define NOTIFY_READY_MESSAGE "READY=1\n" "STATUS=Processing requests..."
|
|
#define NOTIFY_STOPPING_MESSAGE "STOPPING=1\n" "STATUS=Shutting down..."
|
|
|
|
static inline const char* notify_start(const char *start, const char *stop) {
|
|
if (start)
|
|
(void) sd_notify(false, start);
|
|
|
|
return stop;
|
|
}
|
|
|
|
/* This is intended to be used with _cleanup_ attribute. */
|
|
static inline void notify_on_cleanup(const char **p) {
|
|
if (*p)
|
|
(void) sd_notify(false, *p);
|
|
}
|
|
|
|
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);
|
|
int notify_push_fd(int fd, const char *name);
|
|
int notify_push_fdf(int fd, const char *format, ...) _printf_(2, 3);
|
|
|
|
int notify_reloading_full(const char *status);
|
|
static inline int notify_reloading(void) {
|
|
return notify_reloading_full("Reloading configuration...");
|
|
}
|