Change formatting of some log messages

[ngircd-alex.git] / src / ngircd / log.c

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 396555ee73555e84fb58e4d85b7a779b450ca3b9..d450bd0a2ee543e58bd448c10c87f15e04b4beee 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.60 2006/02/08 17:33:28 fw Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.62 2006/08/05 09:16:21 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -61,7 +61,7 @@ Log_Init( bool Daemon_Mode )
        Is_Daemon = Daemon_Mode;
        
 #ifdef SYSLOG
-#ifndef LOG_CONS       /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
+#ifndef LOG_CONS     /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
 #define LOG_CONS 0
 #endif
 #ifndef LOG_LOCAL5
@@ -162,6 +162,16 @@ Log_Exit( void )
 } /* Log_Exit */
 
 
+/**
+ * Log function for debug messages.
+ * This function is only functional when the program is compiled with debug
+ * code enabled; otherwise it is an empty function which the compiler will
+ * hopefully mangle down to "nothing" (see log.h). Therefore you should use
+ * LogDebug(...) in favor to Log(LOG_DEBUG, ...).
+ * @param Format Format string like printf().
+ * @param ... Further arguments.
+ */
+#ifdef DEBUG
 # ifdef PROTOTYPES
 GLOBAL void
 LogDebug( const char *Format, ... )
@@ -170,8 +180,7 @@ GLOBAL void
 LogDebug( Format, va_alist )
 const char *Format;
 va_dcl
-# endif
-#ifdef DEBUG
+# endif /* PROTOTYPES */
 {
        char msg[MAX_LOG_MSG_LEN];
        va_list ap;
@@ -186,11 +195,20 @@ va_dcl
        va_end( ap );
        Log(LOG_DEBUG, "%s", msg);
 }
-#else
-{ /* do nothing */ }
 #endif /* DEBUG */
 
-       
+
+/**
+ * Logging function of ngIRCd.
+ * This function logs messages to the console and/or syslog, whichever is
+ * 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!
+ * @param Level syslog level (LOG_xxx)
+ * @param Format Format string like printf().
+ * @param ... Further arguments.
+ */
 #ifdef PROTOTYPES
 GLOBAL void
 Log( int Level, const char *Format, ... )
@@ -202,7 +220,6 @@ const char *Format;
 va_dcl
 #endif
 {
-       /* Eintrag in Logfile(s) schreiben */
        char msg[MAX_LOG_MSG_LEN];
        bool snotice;
        va_list ap;
@@ -223,7 +240,6 @@ va_dcl
        if( Level == LOG_DEBUG ) return;
 #endif
 
-       /* String mit variablen Argumenten zusammenbauen ... */
 #ifdef PROTOTYPES
        va_start( ap, Format );
 #else
@@ -232,11 +248,11 @@ va_dcl
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       if( ! Is_Daemon )
-       {
-               /* auf Konsole ausgeben */
-               fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
-               fflush( stdout );
+       if (!Is_Daemon) {
+               /* log to console */
+               fprintf(stdout, "[%d:%d %4ld] %s\n", (int)getpid( ), Level,
+                       time(NULL) - NGIRCd_Start, msg);
+               fflush(stdout);
        }
 #ifdef SYSLOG
        else
@@ -253,10 +269,11 @@ va_dcl
                fflush( stderr );
        }
 
-       if( snotice )
-       {
-               /* NOTICE an lokale User mit "s"-Mode */
-               Wall_ServerNotice( msg );
+       if (snotice) {
+               /* Send NOTICE to all local users with mode +s and to the
+                * local &SERVER channel */
+               Wall_ServerNotice(msg);
+               Channel_LogServer(msg);
        }
 } /* Log */
 
@@ -318,11 +335,11 @@ va_dcl
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       if( ! Is_Daemon )
-       {
+       if (!Is_Daemon) {
                /* Output to console */
-               fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
-               fflush( stdout );
+               fprintf(stdout, "[%d:%d %4ld] %s\n", (int)getpid( ), Level,
+                       time(NULL) - NGIRCd_Start, msg);
+               fflush(stdout);
        }
 #ifdef SYSLOG
        else syslog( Level, "%s", msg );