Convert uses of Log(LOG_DEBUG, ...) to LogDebug()

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

diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index e352d586e80c9c62743b8c01ec5d0ffe354be832..cfecd5d5fc869bd240d45ee1c4111dcd0adffbd5 100644 (file)
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -46,17 +46,17 @@ static const int signals_catch[] = {
 static void
 Dump_State(void)
 {
-       Log(LOG_DEBUG, "--- Internal server state: %s ---",
+       LogDebug("--- Internal server state: %s ---",
            Client_ID(Client_ThisServer()));
 #ifdef HAVE_LONG_LONG
-       Log(LOG_DEBUG, "time()=%llu", (unsigned long long)time(NULL));
+       LogDebug("time()=%llu", (unsigned long long)time(NULL));
 #else
-       Log(LOG_DEBUG, "time()=%lu", (unsigned long)time(NULL));
+       LogDebug("time()=%lu", (unsigned long)time(NULL));
 #endif
        Conf_DebugDump();
        Conn_DebugDump();
        Client_DebugDump();
-       Log(LOG_DEBUG, "--- End of state dump ---");
+       LogDebug("--- End of state dump ---");
 } /* Dump_State */
 
 #endif
@@ -119,7 +119,7 @@ Rehash(void)
        if (strcmp(old_name, Conf_ServerName) != 0 ) {
                strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName);
                Log(LOG_ERR,
-                   "Can't change \"ServerName\" on runtime! Ignored new name.");
+                   "Can't change server name (\"Name\") on runtime! Ignored new name.");
        }
        if (old_nicklen != Conf_MaxNickLength) {
                Conf_MaxNickLength = old_nicklen;
@@ -132,7 +132,7 @@ Rehash(void)
 
        if (!ConnSSL_InitLibrary())
                Log(LOG_WARNING,
-                   "Re-Initializing of SSL failed, using old keys!");
+                   "Re-Initializing of SSL failed!");
 
        /* Start listening on sockets */
        Conn_InitListeners( );
@@ -154,6 +154,14 @@ Rehash(void)
 static void
 Signal_Handler(int Signal)
 {
+       if (Signal != SIGCHLD) {
+#ifdef HAVE_STRSIGNAL
+               Log(LOG_INFO, "Got signal \"%s\" ...", strsignal(Signal));
+#else
+               Log(LOG_INFO, "Got signal %d ...", Signal);
+#endif
+       }
+
        switch (Signal) {
        case SIGTERM:
        case SIGINT:
@@ -227,7 +235,7 @@ Signal_Handler_BH(int Signal)
                }
                break;
        default:
-               Log(LOG_DEBUG, "Got signal %d! Ignored.", Signal);
+               LogDebug("Got signal %d! Ignored.", Signal);
 #endif
        }
        Signal_Unblock(Signal);