X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=dae53f9f5b45481b56be1295eb451eb2f162a986;hb=8fdb8f90b1756520f173a0dc11a2320cb63c0a4e;hp=e5bed7912f28401ab93884ee5e84ad4c0c5f7465;hpb=628c14d65686c4c848a17381b8ef61c78dbcf405;p=ngircd.git

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index e5bed791..dae53f9f 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,44 +16,39 @@
  * 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;
+static bool Use_Syslog;
 
 
 static void
 Log_Message(int Level, const char *msg)
 {
-	if (!Is_Daemon) {
+	if (!Use_Syslog) {
 		/* 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
@@ -68,12 +63,12 @@ Log_Message(int Level, const char *msg)
  * Initialitze logging.
  * This function is called before the configuration file is read in.
  *
- * @param Daemon_Mode Set to true if ngIRCd is running as daemon.
+ * @param Syslog_Mode Set to true if ngIRCd is configured to log to the syslog.
  */
 GLOBAL void
-Log_Init(bool Daemon_Mode)
+Log_Init(bool Syslog_Mode)
 {
-	Is_Daemon = Daemon_Mode;
+	Use_Syslog = Syslog_Mode;
 
 #ifdef SYSLOG
 #ifndef LOG_CONS     /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */
@@ -85,6 +80,7 @@ Log_Init(bool Daemon_Mode)
 	openlog(PACKAGE, LOG_CONS|LOG_PID, 0);
 #endif
 #endif
+	Log(LOG_NOTICE, "%s starting ...", NGIRCd_Version);
 } /* Log_Init */
 
 
@@ -101,15 +97,13 @@ Log_ReInit(void)
 	closelog();
 	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_INFO, "%s done%s, served %lu connection%s.", PACKAGE_NAME,
+	Log(LOG_NOTICE, "%s done%s, served %lu connection%s.", PACKAGE_NAME,
 	    NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(),
 	    Conn_CountAccepted() == 1 ? "" : "s");
 #ifdef SYSLOG
@@ -127,7 +121,6 @@ Log_Exit( void )
  * @param Format Format string like printf().
  * @param ... Further arguments.
  */
-#ifdef DEBUG
 # ifdef PROTOTYPES
 GLOBAL void
 LogDebug( const char *Format, ... )
@@ -151,7 +144,6 @@ va_dcl
 	va_end( ap );
 	Log(LOG_DEBUG, "%s", msg);
 }
-#endif	/* DEBUG */
 
 
 /**
@@ -160,7 +152,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.
@@ -190,11 +182,7 @@ va_dcl
 	}
 	else snotice = false;
 
-#ifdef DEBUG
 	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
-#else
-	if( Level == LOG_DEBUG ) return;
-#endif
 
 #ifdef PROTOTYPES
 	va_start( ap, Format );
@@ -221,20 +209,16 @@ Log_Init_Subprocess(char UNUSED *Name)
 #ifdef SYSLOG
 	openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
 #endif
-#ifdef DEBUG
 	Log_Subprocess(LOG_DEBUG, "%s sub-process starting, PID %ld.",
 		     Name, (long)getpid());
-#endif
 }
 
 
 GLOBAL void
 Log_Exit_Subprocess(char UNUSED *Name)
 {
-#ifdef DEBUG
 	Log_Subprocess(LOG_DEBUG, "%s sub-process %ld done.",
 		     Name, (long)getpid());
-#endif
 #ifdef SYSLOG
 	closelog( );
 #endif
@@ -257,13 +241,8 @@ va_dcl
 
 	assert(Format != NULL);
 
-#ifdef DEBUG
 	if ((Level == LOG_DEBUG) && (!NGIRCd_Debug))
 		return;
-#else
-	if (Level == LOG_DEBUG)
-		return;
-#endif
 
 #ifdef PROTOTYPES
 	va_start(ap, Format);