X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=5a81b5b3e03083451d65150b033e04ce4d873151;hb=44acf41cc172e8131c3a987d430b9f948afd26ad;hp=a29c40154d524113d46f4555090609e7248abdb2;hpb=a2e4eb5aafee30a3df32472454dedd2707ca1b2c;p=ngircd-alex.git diff --git a/src/ngircd/log.c b/src/ngircd/log.c index a29c4015..5a81b5b3 100644 --- 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.59 2005/08/29 10:58:00 alex Exp $"; - #include "imp.h" #include #include @@ -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 @@ -156,12 +158,58 @@ Log_Exit( void ) #endif #ifdef SYSLOG - /* syslog abmelden */ - closelog( ); + closelog(); #endif } /* 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, ... ) +# else +GLOBAL void +LogDebug( Format, va_alist ) +const char *Format; +va_dcl +# endif /* PROTOTYPES */ +{ + char msg[MAX_LOG_MSG_LEN]; + va_list ap; + + if (!NGIRCd_Debug) return; +#ifdef PROTOTYPES + va_start( ap, Format ); +#else + va_start( ap ); +#endif + vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); + va_end( ap ); + Log(LOG_DEBUG, "%s", msg); +} +#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, ... ) @@ -173,8 +221,6 @@ const char *Format; va_dcl #endif { - /* Eintrag in Logfile(s) schreiben */ - char msg[MAX_LOG_MSG_LEN]; bool snotice; va_list ap; @@ -195,7 +241,6 @@ va_dcl if( Level == LOG_DEBUG ) return; #endif - /* String mit variablen Argumenten zusammenbauen ... */ #ifdef PROTOTYPES va_start( ap, Format ); #else @@ -204,31 +249,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 */ @@ -240,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 */ @@ -249,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( ); @@ -290,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] %s\n", (int)getpid( ), Level, msg ); - fflush( stdout ); - } -#ifdef SYSLOG - else syslog( Level, "%s", msg ); -#endif + Log_Message(Level, msg); } /* Log_Resolver */