X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=a47ce92cd81571025a446ecd0f54b8553dcf9020;hp=6f0c4c9db1129d3a2cc291d6d3811fd297591ebb;hb=bb1d014abad85b6938cf9d3e88e64f4ee6757ede;hpb=1068f883779ad9b8bf3e1e1b8234781e4223761d

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 6f0c4c9d..a47ce92c 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2019 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
@@ -16,34 +16,29 @@
  * Logging functions
  */
 
-#include "imp.h"
 #include <assert.h>
-#include <errno.h>
 #ifdef PROTOTYPES
-#	include <stdarg.h>
+# include <stdarg.h>
 #else
-#	include <varargs.h>
+# include <varargs.h>
 #endif
 #include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
+#include <time.h>
 #include <unistd.h>
 
 #ifdef SYSLOG
-#include <syslog.h>
+# include <syslog.h>
 #endif
 
 #include "ngircd.h"
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "conf.h"
 
-#include "exp.h"
 #include "log.h"
 
-
 static bool Is_Daemon;
 
 
@@ -53,7 +48,7 @@ Log_Message(int Level, const char *msg)
 	if (!Is_Daemon) {
 		/* log to console */
 		fprintf(stdout, "[%ld:%d %4ld] %s\n", (long)getpid(), Level,
-				(long)time(NULL) - NGIRCd_Start, msg);
+				(long)(time(NULL) - NGIRCd_Start), msg);
 		fflush(stdout);
 	}
 #ifdef SYSLOG
@@ -80,11 +75,12 @@ Log_Init(bool Daemon_Mode)
 #define LOG_CONS 0
 #endif
 #ifdef LOG_DAEMON
-	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_DAEMON);
+	openlog(PACKAGE, LOG_CONS|LOG_PID, LOG_DAEMON);
 #else
-	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, 0);
+	openlog(PACKAGE, LOG_CONS|LOG_PID, 0);
 #endif
 #endif
+	Log(LOG_NOTICE, "%s starting ...", NGIRCd_Version);
 } /* Log_Init */
 
 
@@ -99,18 +95,17 @@ Log_ReInit(void)
 #define LOG_CONS 0
 #endif
 	closelog();
-	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
+	openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
 #endif
-	Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
-	Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile);
 }
 
 
 GLOBAL void
 Log_Exit( void )
 {
-	Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME,
-	    NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted());
+	Log(LOG_NOTICE, "%s done%s, served %lu connection%s.", PACKAGE_NAME,
+	    NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(),
+	    Conn_CountAccepted() == 1 ? "" : "s");
 #ifdef SYSLOG
 	closelog();
 #endif
@@ -159,7 +154,7 @@ va_dcl
  * suitable for the mode ngIRCd is running in (daemon vs. non-daemon).
  * If LOG_snotice is set, the log messages goes to all user with the mode +s
  * set and the local &SERVER channel, too.
- * Please note: you sould use LogDebug(...) for debug messages!
+ * Please note: you should use LogDebug(...) for debug messages!
  * @param Level syslog level (LOG_xxx)
  * @param Format Format string like printf().
  * @param ... Further arguments.
@@ -218,7 +213,7 @@ GLOBAL void
 Log_Init_Subprocess(char UNUSED *Name)
 {
 #ifdef SYSLOG
-	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
+	openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
 #endif
 #ifdef DEBUG
 	Log_Subprocess(LOG_DEBUG, "%s sub-process starting, PID %ld.",