daemon-util: Rename starting/stopping message constants

Currently, NOTIFY_READY from daemon-util.h conflicts with NOTIFY_READY
from NotifyState from service.h so let's rename the constants to avoid
the conflict.

diff --git a/src/home/homed.c b/src/home/homed.c
index bb9d3360d0d10d54dfcab6aacaa096c6318da291..652e32ec7c10aea94250cd071c24d45310e04ffa 100644 (file)
--- a/src/home/homed.c
+++ b/src/home/homed.c
@@ -39,7 +39,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 15c27af090d329a01077afe9d614d723d13082e1..962c5681e416577baf5bcd12ac3312f6bcb3643d 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1939,7 +1939,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 

diff --git a/src/import/importd.c b/src/import/importd.c
index b584a0e685ae234771eaf64ea19ccff7613f7885..a7de9ed24796868145ee055d2bbcec3d8b3100c6 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -2044,7 +2044,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index f0f722ac3ef4433a7e2b11b68955355a400094f7..bf3092ff3147fb0c7ef570c6f1c191f3514f87f7 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -328,7 +328,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         while (!server.quit) {
                 struct epoll_event event;

diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index d33a7ab6b6fb881a83dc88bda5f5e25ea903c3e4..e244b668ee316bb839b51702f96eb2cd5776342b 100644 (file)
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -1180,7 +1180,7 @@ static int run(int argc, char **argv) {
         log_debug("%s running as pid "PID_FMT,
                   program_invocation_short_name, getpid_cached());
 
-        notify_message = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         while (s.active) {
                 r = sd_event_get_state(s.event);

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 7bf10f4de94b37248e7db259e6bdcf539503cc64..6de13e01f72ce23c45c2836d86ec06cc7ebf3d81 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -982,7 +982,7 @@ static int run(int argc, char **argv) {
 
         notify_message = notify_start("READY=1\n"
                                       "STATUS=Processing input...",
-                                      NOTIFY_STOPPING);
+                                      NOTIFY_STOPPING_MESSAGE);
 
         for (;;) {
                 r = sd_event_get_state(u.event);

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 0a50467aaaa006a42009987ff37e5486ecf6ce17..0593b97b1602abf573635397ab88b570ab876254 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -2057,7 +2057,7 @@ static int dispatch_notify_event(sd_event_source *es, int fd, uint32_t revents,
          * there's something to send it will be turned on again. */
 
         if (!s->sent_notify_ready) {
-                if (send(s->notify_fd, NOTIFY_READY, strlen(NOTIFY_READY), MSG_DONTWAIT) < 0) {
+                if (send(s->notify_fd, NOTIFY_READY_MESSAGE, strlen(NOTIFY_READY_MESSAGE), MSG_DONTWAIT) < 0) {
                         if (errno == EAGAIN)
                                 return 0;
 

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 5fc45819ca708fa440b464042db83a2bfead7656..3f742b8a6276b11ebfed1dbdc1be657e8c285050 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -664,7 +664,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 

diff --git a/src/login/logind.c b/src/login/logind.c
index e07b9e52965bea9795180be50be668a07affa1bc..ad76b0697276520527f43aea651e6995d6aa6964 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1088,7 +1088,7 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa
         else
                 log_info("Config file reloaded.");
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset= */ false, NOTIFY_READY_MESSAGE);
         return 0;
 }
 
@@ -1268,7 +1268,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to fully start up daemon: %m");
 
-        notify_message = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
         return manager_run(m);
 }
 

diff --git a/src/machine/machined.c b/src/machine/machined.c
index bc2739268f3da74848df38a40059f709e4c45cb0..364f9dfab6756946cc0d699cc743c4f85f22842e 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -345,7 +345,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to fully start up daemon: %m");
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 

diff --git a/src/mountfsd/mountfsd.c b/src/mountfsd/mountfsd.c
index 6073bd548e5ce273fff7ef4ae534e4c703670f0d..87f4ab725a61aee7c1c840e97c52aa9f77b537b9 100644 (file)
--- a/src/mountfsd/mountfsd.c
+++ b/src/mountfsd/mountfsd.c
@@ -31,7 +31,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index f4e8c41a764d84325e0fd8a0e10a70cd3e505787..cf713f3ffefd3ba63f4492cc9c491932c563abeb 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1229,6 +1229,6 @@ int manager_reload(Manager *m, sd_bus_message *message) {
         log_debug("Reloaded.");
         r = 0;
 finish:
-        (void) sd_notify(/* unset_environment= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset_environment= */ false, NOTIFY_READY_MESSAGE);
         return r;
 }

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 2060e6b2fa3a95ccd0cbb9fddbe4d1b7de13f354..d39cb19ed2d7a7d28f718d7f73a165e1e153e10e 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -108,7 +108,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Could not start manager: %m");
 
-        notify_message = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)

diff --git a/src/nsresourced/nsresourced.c b/src/nsresourced/nsresourced.c
index 07df95b4d7b7a39552161c3183ab29d32c7dc8a2..ff84f766cd93be0c7013827632441116bb8851e9 100644 (file)
--- a/src/nsresourced/nsresourced.c
+++ b/src/nsresourced/nsresourced.c
@@ -34,7 +34,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)

diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index dcec133d6f18d43c561cce452b1aa6cce6a1f88d..d62c07def4651f2dfe863345a28b13fde784b27c 100644 (file)
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -660,7 +660,7 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa
         manager_set_defaults(m);
         manager_parse_config_file(m);
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset= */ false, NOTIFY_READY_MESSAGE);
         return 0;
 }
 

diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 15cbb3a2c35b75655373ff8d62e32d5f5424d15d..11d11a3dc8ae47f133fc7ef1f350065a585e4f0c 100644 (file)
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -152,7 +152,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_msg = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_msg = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         log_debug("systemd-oomd started%s.", arg_dry_run ? " in dry run mode" : "");
 

diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index 75872d51fe8c39c8ef44149ac98c7a75060a63f3..d94feb34cf6a672e61a7b9090e4e6864b622e136 100644 (file)
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -152,7 +152,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to fully start up daemon: %m");
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 78b14ea3bf59e8f6bc13520193fd6a32e0eb7297..e130fe6fdaf16af0cd99e98735b5243169929f01 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -690,7 +690,7 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa
         manager_flush_caches(m, LOG_INFO);
         manager_verify_all(m);
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset= */ false, NOTIFY_READY_MESSAGE);
         return 0;
 }
 

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index d6a7f0cf5a81ce7023ac704de97d1b7b5e1c9b8a..a0c801802390fdb39dc730385b83452681cfbedc 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -85,7 +85,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to drop remaining caps: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index a2b6a480035093635a9e04fc50e29b0cca71e5dc..764548339d327e01a3414b9c9d01679ca3f29dd3 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -154,7 +154,7 @@ int bus_event_loop_with_idle(
 
                         /* Inform the service manager that we are going down, so that it will queue all
                          * further start requests, instead of assuming we are still running. */
-                        (void) sd_notify(false, NOTIFY_STOPPING);
+                        (void) sd_notify(false, NOTIFY_STOPPING_MESSAGE);
 
                         r = bus_async_unregister_and_exit(e, bus, name);
                         if (r < 0)

diff --git a/src/shared/daemon-util.h b/src/shared/daemon-util.h
index ff5e60e9be950cb3f5ddb40a0e25e523d6b2025a..e3daa9ebf500f09662a8169943d9a56b0a4522c7 100644 (file)
--- a/src/shared/daemon-util.h
+++ b/src/shared/daemon-util.h
@@ -7,8 +7,8 @@
 
 #include "macro.h"
 
-#define NOTIFY_READY "READY=1\n" "STATUS=Processing requests..."
-#define NOTIFY_STOPPING "STOPPING=1\n" "STATUS=Shutting down..."
+#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)

diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index 336d6fa754fe13241c23205b979975aed95bb86c..c37fafd34a81752a8fad4bed250cc47ccaad4e73 100644 (file)
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -478,7 +478,7 @@ static int run(int argc, char **argv) {
                 if (r < 0)
                         return r;
 
-                notify = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+                notify = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
         }
 
         for (;;) {

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 6c40617563102026c3967666847c848436b93c60..fb430757e308f2b571008491f7fedc9c580ab99d 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -688,7 +688,7 @@ static int run(int argc, char *argv[]) {
                         return r;
         }
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
         r = sd_event_loop(context.event);
         if (r < 0)
                 return log_error_errno(r, "Failed to run event loop: %m");

diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c
index fbdf35df9954b84b365963175a61cefc3d6fb76b..1f1ebe2e8feeaba86426cb1271dafc621b8fcfcf 100644 (file)
--- a/src/storagetm/storagetm.c
+++ b/src/storagetm/storagetm.c
@@ -1240,7 +1240,7 @@ static int run(int argc, char* argv[]) {
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_message =
                 notify_start("READY=1\n"
                              "STATUS=Exposing disks in target mode...",
-                             NOTIFY_STOPPING);
+                             NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(event);
         if (r < 0)

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index c235573b92687cb81601c59e4095f89857fc87de..5e0fb165a7906f73055bdc651969fe1647d271e7 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1182,7 +1182,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index cecd9fd6ea9a5d91e1b0df53b88203a7b13515c4..6537f1ae9234efd8072a716463b05fcbc0e38296 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -205,7 +205,7 @@ static int run(int argc, char *argv[]) {
 
         notify_message = notify_start("READY=1\n"
                                       "STATUS=Daemon is running",
-                                      NOTIFY_STOPPING);
+                                      NOTIFY_STOPPING_MESSAGE);
 
         r = manager_setup_save_time_event(m);
         if (r < 0)

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index a9240551f09d9bc98d6cc1f813461aad473391fa..fd28591d197214940c62f30ae7e4e7ac9749013d 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -406,7 +406,7 @@ static int process_and_watch_password_files(bool watch) {
         }
 
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_stop =
-                notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+                notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         for (;;) {
                 usec_t timeout = USEC_INFINITY;

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index 2026e24f5d6f84ea48d79edc5fc4f6250ce33e07..6f67f466d5e29de9813306a3292d801e6c90edf1 100644 (file)
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -234,7 +234,7 @@ void manager_exit(Manager *manager) {
 
         manager->exit = true;
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_STOPPING);
+        (void) sd_notify(/* unset= */ false, NOTIFY_STOPPING_MESSAGE);
 
         /* close sources of new events and discard buffered events */
         manager->ctrl = udev_ctrl_unref(manager->ctrl);
@@ -1407,7 +1407,7 @@ int manager_main(Manager *manager) {
                 log_warning_errno(r, "Failed to apply permissions on static device nodes, ignoring: %m");
 
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_message =
-                notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+                notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         /* We will start processing events in the loop below. Before starting processing, let's remove the
          * event serialization fd from the fdstore, to avoid retrieving the serialized events again in future

diff --git a/src/userdb/userdbd.c b/src/userdb/userdbd.c
index 434a50a329e79a2550a7e5f8472c4b9bbc097737..64babef1c40ee08f516705fc810ba48ac64d3508 100644 (file)
--- a/src/userdb/userdbd.c
+++ b/src/userdb/userdbd.c
@@ -47,7 +47,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)