/*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
- *
- * Logging functions
*/
-
#include "portab.h"
-#include "imp.h"
+/**
+ * @file
+ * Logging functions
+ */
+
#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 char Init_Txt[127];
static bool Is_Daemon;
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
}
+/**
+ * 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, LOG_CONS|LOG_PID, LOG_DAEMON);
+#else
+ openlog(PACKAGE, 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, 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
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
* 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.
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.",