X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=62113f11e77ca6435a4afdb6d1844395380cab67;hb=8adff5922376676c2eeb49de1cbab86cc345b887;hp=4cabca7c5a04d7273eefaf56ad36a1699a0784a5;hpb=d68fb7a320496897cbc5e0a86ab00b7cdce2b58b;p=ngircd-alex.git diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 4cabca7c..62113f11 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -2,67 +2,75 @@ * ngIRCd -- The Next Generation IRC Daemon * Copyright (c)2001,2002 by 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.30 2002/03/29 23:58:10 alex Exp $ - * - * log.c: Logging-Funktionen + * Logging functions */ #include "portab.h" +static char UNUSED id[] = "$Id: log.c,v 1.53 2005/03/19 18:43:49 fw Exp $"; + #include "imp.h" #include #include -#include +#ifdef PROTOTYPES +# include +#else +# include +#endif #include #include #include #include -#ifdef USE_SYSLOG +#ifdef SYSLOG #include #endif #include "ngircd.h" -#include "client.h" #include "defines.h" +#include "conn.h" +#include "client.h" +#include "channel.h" #include "irc-write.h" #include "exp.h" #include "log.h" -LOCAL CHAR Error_File[FNAME_LEN]; -LOCAL CHAR Init_Txt[127]; +LOCAL char Init_Txt[127]; + +#ifdef DEBUG +LOCAL char Error_File[FNAME_LEN]; +#endif -LOCAL VOID Wall_ServerNotice( CHAR *Msg ); +LOCAL void Wall_ServerNotice PARAMS(( char *Msg )); -GLOBAL VOID Log_Init( VOID ) +GLOBAL void +Log_Init( void ) { -#ifdef USE_SYSLOG +#ifdef SYSLOG /* 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" ); + strcpy( Init_Txt, "debug-mode" ); } #endif if( NGIRCd_NoDaemon ) @@ -83,50 +91,81 @@ GLOBAL VOID Log_Init( VOID ) } #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, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( )); + + /* stderr umlenken */ fflush( stderr ); - sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( )); if( ! freopen( Error_File, "w", stderr )) { Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno )); return; } + /* 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 ); + + Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File ); } /* 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 ); @@ -134,10 +173,10 @@ GLOBAL VOID 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; @@ -146,48 +185,77 @@ GLOBAL VOID 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 ); - /* Konsole */ - if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg ); - -#ifdef USE_SYSLOG - /* Syslog */ - syslog( Level, msg ); + if( NGIRCd_NoDaemon ) + { + /* auf Konsole ausgeben */ + fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg ); + fflush( stdout ); + } +#ifdef SYSLOG + else + { + /* Syslog */ + syslog( Level, "%s", msg ); + } #endif - /* lokale User mit "s"-Mode */ - if( snotice ) Wall_ServerNotice( msg ); + if( Level <= LOG_CRIT ) + { + /* log critical messages to stderr */ + fprintf( stderr, "%s\n", msg ); + fflush( stderr ); + } + + if( snotice ) + { + /* NOTICE an lokale User mit "s"-Mode */ + Wall_ServerNotice( msg ); + } } /* 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 + Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( )); } /* Log_Init_Resolver */ -GLOBAL VOID Log_Exit_Resolver( VOID ) +GLOBAL void +Log_Exit_Resolver( void ) { -#ifdef USE_SYSLOG + Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( )); +#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 ); @@ -199,18 +267,29 @@ GLOBAL VOID 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 ); - + /* Output */ + if( NGIRCd_NoDaemon ) + { + /* 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 ) +LOCAL void +Wall_ServerNotice( char *Msg ) { /* Server-Notice an entsprechende User verschicken */ @@ -221,7 +300,7 @@ LOCAL VOID Wall_ServerNotice( CHAR *Msg ) c = Client_First( ); while( c ) { - if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s", Client_ThisServer( ), Msg ); + if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg ); c = Client_Next( c ); } } /* Wall_ServerNotice */