From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 10 Jul 2010 13:50:39 +0000 (+0200)
Subject: systemd: send status updates to the init system
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=82afdb286b9f7088986629cb4fde0c76583d85b4;p=catta

systemd: send status updates to the init system
---

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 8bd856e..d0a0eef 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -354,7 +354,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
     switch (state) {
         case AVAHI_SERVER_RUNNING:
             avahi_log_info("Server startup complete. Host name is %s. Local service cookie is %u.", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s));
-
+            sd_notifyf(0, "Server startup complete. Host name is %s. Local service cookie is %u.", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s));
             avahi_set_proc_title(argv0, "%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s));
 
             static_service_add_to_server();
@@ -374,14 +374,16 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
         case AVAHI_SERVER_COLLISION: {
             char *n;
 
-            avahi_set_proc_title(argv0, "%s: collision", argv0);
-
             static_service_remove_from_server();
             static_hosts_remove_from_server();
             remove_dns_server_entry_groups();
 
             n = avahi_alternative_host_name(avahi_server_get_host_name(s));
-            avahi_log_warn("Host name conflict, retrying with <%s>", n);
+
+            avahi_log_warn("Host name conflict, retrying with %s", n);
+            sd_notifyf(0, "Host name conflict, retrying with %s", n);
+            avahi_set_proc_title(argv0, "%s: collision [%s]", argv0, n);
+
             avahi_server_set_host_name(s, n);
             avahi_free(n);
 
@@ -391,11 +393,14 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
         case AVAHI_SERVER_FAILURE:
 
             avahi_log_error("Server error: %s", avahi_strerror(avahi_server_errno(s)));
+            sd_notifyf(0, "Server error: %s", avahi_strerror(avahi_server_errno(s)));
+
             avahi_simple_poll_quit(simple_poll_api);
             break;
 
         case AVAHI_SERVER_REGISTERING:
 
+            sd_notifyf(0, "Registering host name %s", avahi_server_get_host_name_fqdn(s));
             avahi_set_proc_title(argv0, "%s: registering [%s]", argv0, avahi_server_get_host_name_fqdn(s));
 
             static_service_remove_from_server();
@@ -1610,7 +1615,7 @@ int main(int argc, char *argv[]) {
             }
 #endif
         avahi_log_info("%s "PACKAGE_VERSION" starting up.", argv0);
-
+        sd_notifyf(0, "%s "PACKAGE_VERSION" starting up.", argv0);
         avahi_set_proc_title(argv0, "%s: starting up", argv0);
 
         if (run_server(&config) == 0)