X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=5559a2c6ada62e176d1e39ac0f3fda7d6dc4cb09;hp=8e295df6596f90717e0a305994b5646d5adc32e2;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=dbea1873731f7a0bd718b6f84b75faa10b83fe66 diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 8e295df6..5559a2c6 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2005 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 @@ -14,8 +14,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: log.c,v 1.56 2005/06/24 19:20:56 fw Exp $"; - #include "imp.h" #include #include @@ -44,22 +42,40 @@ static char UNUSED id[] = "$Id: log.c,v 1.56 2005/06/24 19:20:56 fw Exp $"; #include "log.h" -LOCAL char Init_Txt[127]; +static char Init_Txt[127]; +static bool Is_Daemon; #ifdef DEBUG -LOCAL char Error_File[FNAME_LEN]; +static char Error_File[FNAME_LEN]; #endif -LOCAL Is_Daemon; -LOCAL void Wall_ServerNotice PARAMS(( char *Msg )); -GLOBAL void Log_SetDaemonized(void) { Is_Daemon = true; } +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( void ) +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 @@ -160,6 +176,53 @@ 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, ... ) +# 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, ... ) @@ -171,8 +234,6 @@ const char *Format; va_dcl #endif { - /* Eintrag in Logfile(s) schreiben */ - char msg[MAX_LOG_MSG_LEN]; bool snotice; va_list ap; @@ -193,7 +254,6 @@ va_dcl if( Level == LOG_DEBUG ) return; #endif - /* String mit variablen Argumenten zusammenbauen ... */ #ifdef PROTOTYPES va_start( ap, Format ); #else @@ -202,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 */ @@ -238,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 */ @@ -247,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( ); @@ -288,31 +336,27 @@ 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 */ -LOCAL void +/** + * Send log messages to users flagged with the "s" mode. + * @param Msg The message to send. + */ +static void Wall_ServerNotice( char *Msg ) { - /* Server-Notice an entsprechende User verschicken */ - CLIENT *c; assert( Msg != NULL ); c = Client_First( ); - while( c ) - { - if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg ); + while(c) { + if (Client_Conn(c) > NONE && Client_HasMode(c, 's')) + IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c), + NOTICE_TXTPREFIX, Msg); + c = Client_Next( c ); } } /* Wall_ServerNotice */