notify: send STOPPING=1 from our daemons

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index d8d989b9b080add82f57434c603a87f532ba35bf..d35d7f63b2f54a49274617939e9c1cc756cb4d1b 100644 (file)
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -239,7 +239,7 @@ static int rename_service(sd_bus *a, sd_bus *b) {
                   pid, p,
                   uid, name,
                   a->unique_name);
                   pid, p,
                   uid, name,
                   a->unique_name);

-                ;
+

         return 0;
 }
 
         return 0;
 }
 


@@ -1474,6 +1474,10 @@ int main(int argc, char *argv[]) {
         }
 
 finish:
         }
 
 finish:

+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Shutting down.");
+

         policy_free(&policy);
         strv_free(arg_configuration);
         free(arg_address);
         policy_free(&policy);
         strv_free(arg_configuration);
         free(arg_address);

diff --git a/src/core/manager.c b/src/core/manager.c
index c91ece116fe9cc0ae60cd1a2969e4fad55ff5e92..7401817844dae63f4750597a413d13230007a6f0 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2551,7 +2551,8 @@ void manager_check_finished(Manager *m) {
         bus_manager_send_finished(m, firmware_usec, loader_usec, kernel_usec, initrd_usec, userspace_usec, total_usec);
 
         sd_notifyf(false,
         bus_manager_send_finished(m, firmware_usec, loader_usec, kernel_usec, initrd_usec, userspace_usec, total_usec);
 
         sd_notifyf(false,

-                   "READY=1\nSTATUS=Startup finished in %s.",
+                   "READY=1\n"
+                   "STATUS=Startup finished in %s.",

                    format_timespan(sum, sizeof(sum), total_usec, USEC_PER_MSEC));
 }
 
                    format_timespan(sum, sizeof(sum), total_usec, USEC_PER_MSEC));
 }
 

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 0954e58afdb1f260809054b2557f274233b0d7e2..f1c2b8dfb4ad8652d9829ccb065b6d694797c383 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -431,6 +431,7 @@ int main(int argc, char *argv[]) {
 
 fail:
         sd_notify(false,
 
 fail:
         sd_notify(false,

+                  "STOPPING=1\n"

                   "STATUS=Shutting down...");
 
         server_done(&server);
                   "STATUS=Shutting down...");
 
         server_done(&server);

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 7f422bfb374f0500cbc2f67f30842c274e554d89..1cc86aeaf3bf17a87e7da57357d1a70acf4d3ac2 100644 (file)
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -1530,10 +1530,12 @@ int main(int argc, char **argv) {
                 }
         }
 
                 }
         }
 

-        server_destroy(&s);
+        sd_notifyf(false,
+                   "STOPPING=1\n"
+                   "STATUS=Shutting down after writing %" PRIu64 " entries...", s.event_count);

         log_info("Finishing after writing %" PRIu64 " entries", s.event_count);
 
         log_info("Finishing after writing %" PRIu64 " entries", s.event_count);
 

-        sd_notify(false, "STATUS=Shutting down...");
+        server_destroy(&s);

 
         free(arg_key);
         free(arg_cert);
 
         free(arg_key);
         free(arg_cert);

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index bdeeff67788363d65a16e38fcab7094c08c026be..40c380aa9ee2277330cac8e9a081b84ab56da9e1 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -818,7 +818,10 @@ int main(int argc, char **argv) {
         }
 
 cleanup:
         }
 
 cleanup:

-        sd_notify(false, "STATUS=Shutting down...");
+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Shutting down...");
+

         destroy_uploader(&u);
 
 finish:
         destroy_uploader(&u);
 
 finish:

diff --git a/src/journal/journald.c b/src/journal/journald.c
index b1a0e25d0cee575149cd37d639ee9a4ee51e0811..de40827d6aac109f524576e6cc42e1ba7b28193f 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -116,7 +116,9 @@ int main(int argc, char *argv[]) {
         server_driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
 
 finish:
         server_driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
 
 finish:

-        sd_notify(false, "STATUS=Shutting down...");
+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Shutting down...");

 
         server_done(&server);
 
 
         server_done(&server);
 

diff --git a/src/login/logind.c b/src/login/logind.c
index 006c56ae51f65eca2637d64ab322816e0d684e4f..52e1c43a472289be13910c6e824cbc4fa111bca7 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1226,6 +1226,7 @@ int main(int argc, char *argv[]) {
 
 finish:
         sd_notify(false,
 
 finish:
         sd_notify(false,

+                  "STOPPING=1\n"

                   "STATUS=Shutting down...");
 
         if (m)
                   "STATUS=Shutting down...");
 
         if (m)

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 616032012737cd94b95c924e5095a0cd7b2ca3b2..f9d180d24a74bc4e3cbf951b766f5ecf4cd1bdae 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -350,6 +350,7 @@ int main(int argc, char *argv[]) {
 
 finish:
         sd_notify(false,
 
 finish:
         sd_notify(false,

+                  "STOPPING=1\n"

                   "STATUS=Shutting down...");
 
         if (m)
                   "STATUS=Shutting down...");
 
         if (m)

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 665f4c470900f6b02cddff4eb67cc5e3f3bddc1f..fdb80368d4dddfce19cfcd5cbd6068e3b9770418 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -125,6 +125,7 @@ int main(int argc, char *argv[]) {
 
 out:
         sd_notify(false,
 
 out:
         sd_notify(false,

+                  "STOPPING=1\n"

                   "STATUS=Shutting down...");
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
                   "STATUS=Shutting down...");
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d01da45930ce1900777c6248ecaa8a6e650a086a..2c718557ee98876e18378f03fd5d31926828dac2 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3071,7 +3071,9 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
                 goto finish;
         }
 

-        sd_notify(0, "READY=1");
+        sd_notify(false,
+                  "READY=1\n"
+                  "STATUS=Container running.");

 
         assert_se(sigemptyset(&mask) == 0);
         assert_se(sigemptyset(&mask_chld) == 0);
 
         assert_se(sigemptyset(&mask) == 0);
         assert_se(sigemptyset(&mask_chld) == 0);


@@ -3504,6 +3506,10 @@ int main(int argc, char *argv[]) {
         }
 
 finish:
         }
 
 finish:

+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Terminating...");
+

         loop_remove(loop_nr, &image_fd);
 
         if (pid > 0)
         loop_remove(loop_nr, &image_fd);
 
         if (pid > 0)

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 8235558585d0f7ce031dd50d7cdca43b5010322e..88c3bcc5918c777cfacc35a1213a335c5b4487ac 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -100,7 +100,9 @@ int main(int argc, char *argv[]) {
         sd_event_get_exit_code(m->event, &r);
 
 finish:
         sd_event_get_exit_code(m->event, &r);
 
 finish:

-        sd_notify(false, "STATUS=Shutting down...");
+        sd_notify(false,
+                  "STOPPIN=1\n"
+                  "STATUS=Shutting down...");

 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }

diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 92907497ed4aaa2ad8b110d19d9ba89d1312acb6..99aa4b32b3ffc6e2f7ac3b2db7f6076d97e31f0f 100644 (file)
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -456,6 +456,7 @@ finish:
         }
 
         sd_notify(false,
         }
 
         sd_notify(false,

+                  "STOPPING=\n"

                   "STATUS=Exiting...");
 
         return r;
                   "STATUS=Exiting...");
 
         return r;

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 351bfd0236de4437b216ec61667e6272645aa246..ee3bc99ae042d97dec49060317b96381f8e36392 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -132,7 +132,9 @@ int main(int argc, char *argv[]) {
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 
         log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 
         log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());

-        sd_notify(false, "READY=1");
+        sd_notify(false,
+                  "READY=1\n"
+                  "STATUS=Daemon is running");

 
         if (network_is_online()) {
                 r = manager_connect(m);
 
         if (network_is_online()) {
                 r = manager_connect(m);


@@ -153,7 +155,9 @@ int main(int argc, char *argv[]) {
         sd_event_get_exit_code(m->event, &r);
 
 finish:
         sd_event_get_exit_code(m->event, &r);
 
 finish:

-        sd_notify(false, "STATUS=Shutting down...");
+        sd_notify(false,
+                  "STOPPING=1\n"
+                  "STATUS=Shutting down...");

 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }