Ping the service manager and set a status message

[ngircd-alex.git] / src / ngircd / conn.c

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 100429435eeb6dcae4ed59c76db558a322e43262..b7838ea857e723cab0a16ee52d3f835d4ddc3e88 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -66,6 +66,7 @@
 #include "ng_ipaddr.h"
 #include "parse.h"
 #include "resolve.h"
+#include "sighandlers.h"
 
 #define SERVER_WAIT (NONE - 1)         /** "Wait for outgoing connection" flag */
 
@@ -668,11 +669,13 @@ Conn_Handler(void)
        int i;
        size_t wdatalen;
        struct timeval tv;
-       time_t t;
+       time_t t, notify_t = 0;
        bool command_available;
+       char status[200];
 
        Log(LOG_NOTICE, "Server \"%s\" (on \"%s\") ready.",
            Client_ID(Client_ThisServer()), Client_Hostname(Client_ThisServer()));
+       Signal_NotifySvcMgr("READY=1\n");
 
        while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
                t = time(NULL);
@@ -781,20 +784,34 @@ Conn_Handler(void)
                        exit(1);
                }
 
-               /* Should ngIRCd timeout when idle? */
+               t = time(NULL);
                if (Conf_IdleTimeout > 0 && NumConnectionsAccepted > 0
-                   && idle_t > 0 && time(NULL) - idle_t >= Conf_IdleTimeout) {
+                   && idle_t > 0 && t - idle_t >= Conf_IdleTimeout) {
+                       /* Should ngIRCd timeout when idle? */
                        LogDebug("Server idle timeout reached: %d second%s. Initiating shutdown ...",
                                 Conf_IdleTimeout,
                                 Conf_IdleTimeout == 1 ? "" : "s");
                        NGIRCd_SignalQuit = true;
+               } else if (Signal_NotifySvcMgr_Possible() && t - notify_t > 3) {
+                       /* Send the current status to the service manager. */
+                       snprintf(status, sizeof(status),
+                                "WATCHDOG=1\nSTATUS=%ld connection%s established (%ld user%s, %ld server%s), %ld maximum. %ld accepted in total.\n",
+                                NumConnections, NumConnections == 1 ? "" : "s",
+                                Client_MyUserCount(), Client_MyUserCount() == 1 ? "" : "s",
+                                Client_MyServerCount(), Client_MyServerCount() == 1 ? "" : "s",
+                                NumConnectionsMax, NumConnectionsAccepted);
+                       Signal_NotifySvcMgr(status);
+                       notify_t = t;
                }
        }
 
-       if (NGIRCd_SignalQuit)
+       if (NGIRCd_SignalQuit) {
                Log(LOG_NOTICE | LOG_snotice, "Server going down NOW!");
-       else if (NGIRCd_SignalRestart)
+               Signal_NotifySvcMgr("STOPPING=1\n");
+       } else if (NGIRCd_SignalRestart) {
                Log(LOG_NOTICE | LOG_snotice, "Server restarting NOW!");
+               Signal_NotifySvcMgr("RELOADING=1\n");
+       }
 } /* Conn_Handler */
 
 /**