X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=d79de269bc0b47b02b1f4cf445f5acf3ae4828a9;hp=ff811630b95dd7f1d5526c8cf20775657d3f2ef2;hb=56b7e67307c1be110eaa4e84681bca03df21bd69;hpb=615d09459ee7c485be38c6957447d73838249054 diff --git a/src/ngircd/log.c b/src/ngircd/log.c index ff811630..d79de269 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -1,19 +1,21 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2010 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. - * - * Logging functions */ - #include "portab.h" +/** + * @file + * Logging functions + */ + #include "imp.h" #include #include @@ -34,9 +36,9 @@ #include "ngircd.h" #include "defines.h" #include "conn.h" -#include "client.h" #include "channel.h" #include "irc-write.h" +#include "conf.h" #include "exp.h" #include "log.h" @@ -45,12 +47,6 @@ static char Init_Txt[127]; static bool Is_Daemon; -#ifdef DEBUG -static char Error_File[FNAME_LEN]; -#endif - - -static void Wall_ServerNotice PARAMS(( char *Msg )); static void Log_Message(int Level, const char *msg) @@ -75,13 +71,10 @@ 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 */ #define LOG_CONS 0 #endif -#ifndef LOG_LOCAL5 -#define LOG_LOCAL5 0 -#endif - openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); + openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif Log( LOG_NOTICE, "%s started.", NGIRCd_Version ); @@ -112,51 +105,14 @@ Log_Init( bool Daemon_Mode ) } #endif if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt ); - -#ifdef DEBUG - Error_File[0] = '\0'; -#endif } /* Log_Init */ -#ifdef DEBUG -GLOBAL void -Log_InitErrorfile( void ) -{ - snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( )); - - fflush( stderr ); - if( ! freopen( Error_File, "w", stderr )) - { - Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno )); - return; - } - - 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 ); - - Log(LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File); -} /* Log_InitErrfile */ -#endif - - GLOBAL void Log_Exit( void ) { - /* Good Bye! */ Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME, NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted()); - -#ifdef DEBUG - if( Error_File[0] ) - { - /* Error-File (stderr) loeschen */ - if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno )); - } -#endif - #ifdef SYSLOG closelog(); #endif @@ -251,102 +207,113 @@ va_dcl Log_Message(Level, msg); - if (Level <= LOG_CRIT) { - /* log critical messages to stderr */ - fprintf(stderr, "%s\n", msg); - fflush(stderr); - } - if (snotice) { /* Send NOTICE to all local users with mode +s and to the * local &SERVER channel */ - Wall_ServerNotice(msg); + Log_ServerNotice('s', "%s", msg); Channel_LogServer(msg); } } /* Log */ GLOBAL void -Log_Init_Resolver( void ) +Log_Init_Subprocess(char UNUSED *Name) { #ifdef SYSLOG - openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); + openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif #ifdef DEBUG - Log_Resolver(LOG_DEBUG, "Resolver sub-process starting, PID %ld.", (long)getpid()); + Log_Subprocess(LOG_DEBUG, "%s sub-process starting, PID %ld.", + Name, (long)getpid()); #endif -} /* Log_Init_Resolver */ +} GLOBAL void -Log_Exit_Resolver( void ) +Log_Exit_Subprocess(char UNUSED *Name) { #ifdef DEBUG - Log_Resolver(LOG_DEBUG, "Resolver sub-process %ld done.", (long)getpid()); + Log_Subprocess(LOG_DEBUG, "%s sub-process %ld done.", + Name, (long)getpid()); #endif #ifdef SYSLOG closelog( ); #endif -} /* Log_Exit_Resolver */ +} #ifdef PROTOTYPES GLOBAL void -Log_Resolver( const int Level, const char *Format, ... ) +Log_Subprocess(const int Level, const char *Format, ...) #else GLOBAL void -Log_Resolver( Level, Format, va_alist ) +Log_Subprocess(Level, Format, va_alist) const int Level; const char *Format; va_dcl #endif { - /* Eintrag des Resolver in Logfile(s) schreiben */ - char msg[MAX_LOG_MSG_LEN]; va_list ap; - assert( Format != NULL ); + assert(Format != NULL); #ifdef DEBUG - if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return; + if ((Level == LOG_DEBUG) && (!NGIRCd_Debug)) + return; #else - if( Level == LOG_DEBUG ) return; + if (Level == LOG_DEBUG) + return; #endif - /* String mit variablen Argumenten zusammenbauen ... */ #ifdef PROTOTYPES - va_start( ap, Format ); + va_start(ap, Format); #else - va_start( ap ); + va_start(ap); #endif - vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); - va_end( ap ); + vsnprintf(msg, MAX_LOG_MSG_LEN, Format, ap); + va_end(ap); Log_Message(Level, msg); -} /* Log_Resolver */ +} /** - * Send log messages to users flagged with the "s" mode. - * @param Msg The message to send. + * Send a log message to all local users flagged with the given user mode. + * @param UserMode User mode which the target user must have set, + * @param Format The format string. */ -static void -Wall_ServerNotice( char *Msg ) +#ifdef PROTOTYPES +GLOBAL void +Log_ServerNotice(const char UserMode, const char *Format, ... ) +#else +GLOBAL void +Log_ServerNotice(UserMode, Format, va_alist) +const char UserMode; +const char *Format; +va_dcl +#endif { CLIENT *c; + char msg[MAX_LOG_MSG_LEN]; + va_list ap; - assert( Msg != NULL ); + assert(Format != NULL); - c = Client_First( ); - while(c) { - if (Client_Conn(c) > NONE && Client_HasMode(c, 's')) - IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c), - NOTICE_TXTPREFIX, Msg); +#ifdef PROTOTYPES + va_start(ap, Format); +#else + va_start(ap); +#endif + vsnprintf(msg, MAX_LOG_MSG_LEN, Format, ap); + va_end(ap); - c = Client_Next( c ); + for(c=Client_First(); c != NULL; c=Client_Next(c)) { + if (Client_Conn(c) > NONE && Client_HasMode(c, UserMode)) + IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c), + NOTICE_TXTPREFIX, msg); } -} /* Wall_ServerNotice */ +} /* Log_ServerNotice */ /* -eof- */