mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

sd_notify(3): set the MONOTONIC_USEC field with RELOADING=1

Browse Source 
When using sd_notify(3) to send a message to the service manager
about named being reloaded, systemd also requires the MONOTONIC_USEC
field to be set to the current monotonic time in microseconds,
otherwise the 'systemctl reload' command fails.

Add the MONOTONIC_USEC field to the message.

See 'man 5 systemd.service' for more information.
This commit is contained in:
Aram Sargsyan
2023-10-19 12:57:13 +00:00
parent 60856e65cb
commit 71b2f40963
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bin/named/server.c
View File

@@ -59,6 +59,7 @@
#include <isc/stats.h>
#include <isc/stdio.h>
#include <isc/string.h>
#include <isc/time.h>
#include <isc/timer.h>
#include <isc/util.h>
@@ -10287,8 +10288,15 @@ reload(named_server_t *server) {
atomic_store(&server->reload_status, NAMED_RELOAD_IN_PROGRESS);
#if HAVE_LIBSYSTEMD
sd_notify(0, "RELOADING=1\n"
"STATUS=reload command received\n");
char buf[512];
int n = snprintf(buf, sizeof(buf),
"RELOADING=1\n"
"MONOTONIC_USEC=%" PRIu64 "\n"
"STATUS=reload command received\n",
(uint64_t)isc_time_monotonic() / NS_PER_US);
if (n > 0 && (size_t)n < sizeof(buf)) {
sd_notify(0, buf);
}
#endif /* HAVE_LIBSYSTEMD */
CHECK(loadconfig(server));
@@ -10668,8 +10676,15 @@ named_server_reconfigcommand(named_server_t *server) {
isc_result_t result;
atomic_store(&server->reload_status, NAMED_RELOAD_IN_PROGRESS);
#if HAVE_LIBSYSTEMD
sd_notify(0, "RELOADING=1\n"
"STATUS=reconfig command received\n");
char buf[512];
int n = snprintf(buf, sizeof(buf),
"RELOADING=1\n"
"MONOTONIC_USEC=%" PRIu64 "\n"
"STATUS=reconfig command received\n",
(uint64_t)isc_time_monotonic() / NS_PER_US);
if (n > 0 && (size_t)n < sizeof(buf)) {
sd_notify(0, buf);
}
#endif /* HAVE_LIBSYSTEMD */
CHECK(loadconfig(server));