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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index ea9b367a..6f0c4c9d 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
  *
  * 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
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
@@ -45,7 +44,6 @@
 #include "log.h"
 
 
-static char Init_Txt[127];
 static bool Is_Daemon;
 
 
@@ -66,47 +64,46 @@ 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.
+ */
 GLOBAL void
-Log_Init( bool Daemon_Mode )
+Log_Init(bool Daemon_Mode)
 {
 	Is_Daemon = Daemon_Mode;
-	
+
 #ifdef SYSLOG
 #ifndef LOG_CONS     /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */
 #define LOG_CONS 0
 #endif
-	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
+#ifdef LOG_DAEMON
+	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_DAEMON);
+#else
+	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, 0);
+#endif
 #endif
+} /* Log_Init */
 
-	Log( LOG_NOTICE, "%s started.", NGIRCd_Version );
-	  
-	/* Information about "Operation Mode" */
-	Init_Txt[0] = '\0';
-#ifdef DEBUG
-	if( NGIRCd_Debug )
-	{
-		strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt );
-	}
+
+/**
+ * Re-init logging after reading the configuration file.
+ */
+GLOBAL void
+Log_ReInit(void)
+{
+#ifdef SYSLOG
+#ifndef LOG_CONS     /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */
+#define LOG_CONS 0
 #endif
-	if( ! Is_Daemon )
-	{
-		if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
-		strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt );
-	}
-	if( NGIRCd_Passive )
-	{
-		if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
-		strlcat( Init_Txt, "passive-mode", sizeof Init_Txt );
-	}
-#ifdef SNIFFER
-	if( NGIRCd_Sniffer )
-	{
-		if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
-		strlcat( Init_Txt, "network sniffer", sizeof Init_Txt );
-	}
+	closelog();
+	openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
 #endif
-	if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
-} /* Log_Init */
+	Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
+	Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile);
+}
 
 
 GLOBAL void