Allow pre-defined server local channels ("&").

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index af8bcc60d652cae7acbb02fa13f0bbf54cdff638..5559a2c6ada62e176d1e39ac0f3fda7d6dc4cb09 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,8 +14,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.61 2006/07/23 23:23:45 alex Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -54,6 +52,22 @@ static char Error_File[FNAME_LEN];
 
 static void Wall_ServerNotice PARAMS(( char *Msg ));
 
+static void
+Log_Message(int Level, const char *msg)
+{
+       if (!Is_Daemon) {
+               /* log to console */
+               fprintf(stdout, "[%ld:%d %4ld] %s\n", (long)getpid(), Level,
+                               (long)time(NULL) - NGIRCd_Start, msg);
+               fflush(stdout);
+       }
+#ifdef SYSLOG
+       else {
+               syslog(Level, "%s", msg);
+       }
+#endif
+}
+
 
 GLOBAL void
 Log_Init( bool Daemon_Mode )
@@ -61,7 +75,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
@@ -166,25 +180,21 @@ Log_Exit( void )
  * 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". Therefore you should use LogDebug(...)
- * in favor to Log(LOG_DEBUG, ...).
+ * 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
-#ifdef DEBUG
 LogDebug( const char *Format, ... )
-#else
-LogDebug( UNUSED const char *Format, ... )
-#endif /* DEBUG */
 # else
 GLOBAL void
 LogDebug( Format, va_alist )
 const char *Format;
 va_dcl
 # endif /* PROTOTYPES */
-#ifdef DEBUG
 {
        char msg[MAX_LOG_MSG_LEN];
        va_list ap;
@@ -199,18 +209,15 @@ va_dcl
        va_end( ap );
        Log(LOG_DEBUG, "%s", msg);
 }
-#else
-{
-       /* Do nothing.
-        * The compiler should optimize this out, please ;-) */
-}
 #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().
@@ -227,7 +234,6 @@ const char *Format;
 va_dcl
 #endif
 {
-       /* Eintrag in Logfile(s) schreiben */
        char msg[MAX_LOG_MSG_LEN];
        bool snotice;
        va_list ap;
@@ -248,7 +254,6 @@ va_dcl
        if( Level == LOG_DEBUG ) return;
 #endif
 
-       /* String mit variablen Argumenten zusammenbauen ... */
 #ifdef PROTOTYPES
        va_start( ap, Format );
 #else
@@ -257,31 +262,19 @@ 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 );
-       }
-#ifdef SYSLOG
-       else
-       {
-               /* Syslog */
-               syslog( Level, "%s", msg );
-       }
-#endif
+       Log_Message(Level, msg);
 
-       if( Level <= LOG_CRIT )
-       {
+       if (Level <= LOG_CRIT) {
                /* log critical messages to stderr */
-               fprintf( stderr, "%s\n", msg );
-               fflush( stderr );
+               fprintf(stderr, "%s\n", msg);
+               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 */
 
@@ -293,7 +286,7 @@ Log_Init_Resolver( void )
        openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 #ifdef DEBUG
-       Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
+       Log_Resolver(LOG_DEBUG, "Resolver sub-process starting, PID %ld.", (long)getpid());
 #endif
 } /* Log_Init_Resolver */
 
@@ -302,7 +295,7 @@ GLOBAL void
 Log_Exit_Resolver( void )
 {
 #ifdef DEBUG
-       Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+       Log_Resolver(LOG_DEBUG, "Resolver sub-process %ld done.", (long)getpid());
 #endif
 #ifdef SYSLOG
        closelog( );
@@ -343,15 +336,7 @@ va_dcl
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       if( ! Is_Daemon )
-       {
-               /* Output to console */
-               fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
-               fflush( stdout );
-       }
-#ifdef SYSLOG
-       else syslog( Level, "%s", msg );
-#endif
+       Log_Message(Level, msg);
 } /* Log_Resolver */