Revert "Set the "last data" time to "last ping" time when updating the latter"

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

diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index 5cde24b066af392e125aefa893f15a68b92ccda9..8275123e6acd433a555f4e130a11faa10205ab47 100644 (file)
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,7 +48,11 @@ Dump_State(void)
 {
        Log(LOG_DEBUG, "--- Internal server state: %s ---",
            Client_ID(Client_ThisServer()));
-       Log(LOG_DEBUG, "time()=%ld", time(NULL));
+#ifdef HAVE_LONG_LONG
+       Log(LOG_DEBUG, "time()=%llu", (unsigned long long)time(NULL));
+#else
+       Log(LOG_DEBUG, "time()=%lu", (unsigned long)time(NULL));
+#endif
        Conf_DebugDump();
        Conn_DebugDump();
        Client_DebugDump();
@@ -115,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;
@@ -128,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( );
@@ -150,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: