New function Conn_IPA(): get client IP address as string

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 5edbf368a53bfbc87b3b9e4e81c2d766610cd324..ff811630b95dd7f1d5526c8cf20775657d3f2ef2 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.62 2006/08/05 09:16:21 fw 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,20 +75,18 @@ 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
 #define LOG_LOCAL5 0
 #endif
-       /* Syslog initialisieren */
        openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 
-       /* Hello World! */
        Log( LOG_NOTICE, "%s started.", NGIRCd_Version );
          
-       /* Informationen uebern den "Operation Mode" */
+       /* Information about "Operation Mode" */
        Init_Txt[0] = '\0';
 #ifdef DEBUG
        if( NGIRCd_Debug )
@@ -108,17 +120,11 @@ Log_Init( bool Daemon_Mode )
 
 
 #ifdef DEBUG
-
 GLOBAL void
 Log_InitErrorfile( void )
 {
-       /* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
-        * landen z.B. alle Ausgaben von assert()-Aufrufen. */
-
-       /* Dateiname zusammen bauen */
        snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
 
-       /* stderr umlenken */
        fflush( stderr );
        if( ! freopen( Error_File, "w", stderr ))
        {
@@ -126,17 +132,13 @@ Log_InitErrorfile( void )
                return;
        }
 
-       /* Einige Infos in das Error-File schreiben */
        fputs( ctime( &NGIRCd_Start ), stderr );
        fprintf( stderr, "%s started.\n", NGIRCd_Version );
        fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
        fflush( stderr );
 
-#ifdef DEBUG
-       Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
-#endif
+       Log(LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File);
 } /* Log_InitErrfile */
-
 #endif
 
 
@@ -144,8 +146,8 @@ GLOBAL void
 Log_Exit( void )
 {
        /* Good Bye! */
-       if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
-       else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
+       Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME,
+           NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted());
 
 #ifdef DEBUG
        if( Error_File[0] )
@@ -156,8 +158,7 @@ Log_Exit( void )
 #endif
 
 #ifdef SYSLOG
-       /* syslog abmelden */
-       closelog( );
+       closelog();
 #endif
 } /* Log_Exit */
 
@@ -202,6 +203,8 @@ va_dcl
  * 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().
@@ -218,7 +221,6 @@ const char *Format;
 va_dcl
 #endif
 {
-       /* Eintrag in Logfile(s) schreiben */
        char msg[MAX_LOG_MSG_LEN];
        bool snotice;
        va_list ap;
@@ -239,7 +241,6 @@ va_dcl
        if( Level == LOG_DEBUG ) return;
 #endif
 
-       /* String mit variablen Argumenten zusammenbauen ... */
 #ifdef PROTOTYPES
        va_start( ap, Format );
 #else
@@ -248,31 +249,19 @@ va_dcl
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       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
-       {
-               /* 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 */
 
@@ -284,7 +273,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 */
 
@@ -293,7 +282,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( );
@@ -334,15 +323,7 @@ va_dcl
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       if (!Is_Daemon) {
-               /* Output to console */
-               fprintf(stdout, "[%d:%d %4ld] %s\n", (int)getpid( ), Level,
-                       time(NULL) - NGIRCd_Start, msg);
-               fflush(stdout);
-       }
-#ifdef SYSLOG
-       else syslog( Level, "%s", msg );
-#endif
+       Log_Message(Level, msg);
 } /* Log_Resolver */