X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=e5bed7912f28401ab93884ee5e84ad4c0c5f7465;hb=5c6875d7686e1b4dbf1a82b6d159bd5f18da4a52;hp=80b2c056001daeb518012a8ce59782ff8e619eac;hpb=3f46e93ccc429722ed4298127d664673d9e8f37d;p=ngircd-alex.git

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 80b2c056..e5bed791 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -64,6 +64,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.
+ */
 GLOBAL void
 Log_Init(bool Daemon_Mode)
 {
@@ -73,18 +79,39 @@ Log_Init(bool Daemon_Mode)
 #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, LOG_CONS|LOG_PID, LOG_DAEMON);
+#else
+	openlog(PACKAGE, LOG_CONS|LOG_PID, 0);
+#endif
 #endif
+} /* Log_Init */
+
 
+/**
+ * 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
+	closelog();
+	openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
+#endif
 	Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
-} /* Log_Init */
+	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_INFO, "%s done%s, served %lu connection%s.", PACKAGE_NAME,
+	    NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(),
+	    Conn_CountAccepted() == 1 ? "" : "s");
 #ifdef SYSLOG
 	closelog();
 #endif
@@ -192,7 +219,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.",