X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=a29c40154d524113d46f4555090609e7248abdb2;hp=1cf83c31c7e1925424edcaf1cdb2f0679da277f5;hb=a2e4eb5aafee30a3df32472454dedd2707ca1b2c;hpb=c2f60abe55b5a8d320a27df0ce41790fa1141081 diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 1cf83c31..a29c4015 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -1,32 +1,35 @@ /* * 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) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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. * - * $Id: log.c,v 1.33 2002/05/27 13:09:27 alex Exp $ - * - * log.c: Logging-Funktionen + * Logging functions */ #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 -#include +#ifdef PROTOTYPES +# include +#else +# include +#endif #include #include #include #include -#ifdef USE_SYSLOG +#ifdef SYSLOG #include #endif @@ -41,62 +44,79 @@ #include "log.h" -LOCAL CHAR Error_File[FNAME_LEN]; -LOCAL CHAR Init_Txt[127]; +static char Init_Txt[127]; +static bool Is_Daemon; + +#ifdef DEBUG +static char Error_File[FNAME_LEN]; +#endif -LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg )); +static void Wall_ServerNotice PARAMS(( char *Msg )); -GLOBAL VOID -Log_Init( VOID ) +GLOBAL void +Log_Init( bool Daemon_Mode ) { -#ifdef USE_SYSLOG + Is_Daemon = Daemon_Mode; + +#ifdef SYSLOG +#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, LOG_CONS|LOG_PID, LOG_LOCAL5 ); + openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); #endif /* Hello World! */ - Log( LOG_NOTICE, "%s started.", NGIRCd_Version( )); + Log( LOG_NOTICE, "%s started.", NGIRCd_Version ); /* Informationen uebern den "Operation Mode" */ - strcpy( Init_Txt, "" ); + Init_Txt[0] = '\0'; #ifdef DEBUG if( NGIRCd_Debug ) { - if( Init_Txt[0] ) strcat( Init_Txt, ", " ); - strcat( Init_Txt, "debug-mode" ); + strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt ); } #endif - if( NGIRCd_NoDaemon ) + if( ! Is_Daemon ) { - if( Init_Txt[0] ) strcat( Init_Txt, ", " ); - strcat( Init_Txt, "no-daemon-mode" ); + if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt ); + strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt ); } if( NGIRCd_Passive ) { - if( Init_Txt[0] ) strcat( Init_Txt, ", " ); - strcat( Init_Txt, "passive-mode" ); + if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt ); + strlcat( Init_Txt, "passive-mode", sizeof Init_Txt ); } #ifdef SNIFFER if( NGIRCd_Sniffer ) { - if( Init_Txt[0] ) strcat( Init_Txt, ", " ); - strcat( Init_Txt, "network sniffer" ); + if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt ); + strlcat( Init_Txt, "network sniffer", sizeof Init_Txt ); } #endif if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt ); + +#ifdef DEBUG + Error_File[0] = '\0'; +#endif } /* Log_Init */ -GLOBAL VOID -Log_InitErrorfile( VOID ) +#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 */ - sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( )); + snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( )); /* stderr umlenken */ fflush( stderr ); @@ -108,37 +128,55 @@ Log_InitErrorfile( VOID ) /* Einige Infos in das Error-File schreiben */ fputs( ctime( &NGIRCd_Start ), stderr ); - fprintf( stderr, "%s started.\n", NGIRCd_Version( )); + 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_InitErrfile */ +#endif + -GLOBAL VOID -Log_Exit( VOID ) +GLOBAL void +Log_Exit( void ) { /* Good Bye! */ - Log( LOG_NOTICE, PACKAGE" done."); + if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME ); + else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME ); - /* Error-File (stderr) loeschen */ - if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno )); +#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 USE_SYSLOG +#ifdef SYSLOG /* syslog abmelden */ closelog( ); #endif } /* Log_Exit */ -GLOBAL VOID -Log( INT Level, CONST CHAR *Format, ... ) +#ifdef PROTOTYPES +GLOBAL void +Log( int Level, const char *Format, ... ) +#else +GLOBAL void +Log( Level, Format, va_alist ) +int Level; +const char *Format; +va_dcl +#endif { /* Eintrag in Logfile(s) schreiben */ - CHAR msg[MAX_LOG_MSG_LEN]; - BOOLEAN snotice; + char msg[MAX_LOG_MSG_LEN]; + bool snotice; va_list ap; assert( Format != NULL ); @@ -146,10 +184,10 @@ Log( INT Level, CONST CHAR *Format, ... ) if( Level & LOG_snotice ) { /* Notice an User mit "s" Mode */ - snotice = TRUE; + snotice = true; Level &= ~LOG_snotice; } - else snotice = FALSE; + else snotice = false; #ifdef DEBUG if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return; @@ -158,28 +196,35 @@ Log( INT Level, CONST CHAR *Format, ... ) #endif /* String mit variablen Argumenten zusammenbauen ... */ +#ifdef PROTOTYPES va_start( ap, Format ); +#else + va_start( ap ); +#endif vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); va_end( ap ); - if( NGIRCd_NoDaemon ) + if( ! Is_Daemon ) { /* auf Konsole ausgeben */ - printf( "[%d] %s\n", Level, msg ); + fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg ); + fflush( stdout ); + } +#ifdef SYSLOG + else + { + /* Syslog */ + syslog( Level, "%s", msg ); } +#endif if( Level <= LOG_CRIT ) { - /* Kritische Meldungen in Error-File (stderr) */ + /* log critical messages to stderr */ fprintf( stderr, "%s\n", msg ); fflush( stderr ); } -#ifdef USE_SYSLOG - /* Syslog */ - syslog( Level, msg ); -#endif - if( snotice ) { /* NOTICE an lokale User mit "s"-Mode */ @@ -188,34 +233,44 @@ Log( INT Level, CONST CHAR *Format, ... ) } /* Log */ -GLOBAL VOID -Log_Init_Resolver( VOID ) +GLOBAL void +Log_Init_Resolver( void ) { -#ifdef USE_SYSLOG - openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 ); +#ifdef SYSLOG + openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 ); +#endif +#ifdef DEBUG + Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( )); #endif } /* Log_Init_Resolver */ -GLOBAL VOID -Log_Exit_Resolver( VOID ) +GLOBAL void +Log_Exit_Resolver( void ) { -#ifdef USE_SYSLOG +#ifdef DEBUG + Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( )); +#endif +#ifdef SYSLOG closelog( ); #endif } /* Log_Exit_Resolver */ -GLOBAL VOID -Log_Resolver( CONST INT Level, CONST CHAR *Format, ... ) +#ifdef PROTOTYPES +GLOBAL void +Log_Resolver( const int Level, const char *Format, ... ) +#else +GLOBAL void +Log_Resolver( Level, Format, va_alist ) +const int Level; +const char *Format; +va_dcl +#endif { /* Eintrag des Resolver in Logfile(s) schreiben */ -#ifndef USE_SYSLOG - return; -#else - - CHAR msg[MAX_LOG_MSG_LEN]; + char msg[MAX_LOG_MSG_LEN]; va_list ap; assert( Format != NULL ); @@ -227,30 +282,43 @@ Log_Resolver( CONST INT Level, CONST CHAR *Format, ... ) #endif /* String mit variablen Argumenten zusammenbauen ... */ +#ifdef PROTOTYPES va_start( ap, Format ); +#else + va_start( ap ); +#endif vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); va_end( ap ); - /* ... und ausgeben */ - syslog( Level, msg ); - + 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_Resolver */ -LOCAL VOID -Wall_ServerNotice( CHAR *Msg ) +/** + * 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", Client_ThisServer( ), 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 */