X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=0ea5986d693cfe63db460d0a33ef5df7a8098132;hp=7fb9ac150a7fca6322ad7dab4166a17f898b0805;hb=3d74a9c323fa99dbcba47a1c3978ef4984530f92;hpb=d4a60bd4a784743ed1f5ee425ba2701e310b3689 diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 7fb9ac15..0ea5986d 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -1,96 +1,232 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001 by Alexander Barton (alex@barton.de) + * 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 comBase beteiligten Autoren finden Sie in der Datei AUTHORS. + * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: log.c,v 1.7 2001/12/25 22:04:26 alex Exp $ + * $Id: log.c,v 1.29 2002/03/29 23:33:42 alex Exp $ * * log.c: Logging-Funktionen - * - * $Log: log.c,v $ - * Revision 1.7 2001/12/25 22:04:26 alex - * - Aenderungen an den Debug- und Logging-Funktionen. - * - * Revision 1.6 2001/12/25 19:20:39 alex - * - es wird nun die Facility LOG_LOCAL5 zum Loggen verwendet. - * - * Revision 1.5 2001/12/15 00:07:56 alex - * - Log-Level der Start- und Stop-Meldungen angehoben. - * - * Revision 1.4 2001/12/13 02:04:16 alex - * - boesen "Speicherschiesser" in Log() gefixt. - * - * Revision 1.3 2001/12/12 23:31:24 alex - * - Zum Loggen wird nun auch syslog verwendet. - * - * Revision 1.2 2001/12/12 17:19:12 alex - * - in Log-Meldungen wird nun auch der Level der Meldung ausgegeben. - * - * Revision 1.1.1.1 2001/12/11 21:53:04 alex - * - Imported sources to CVS. */ -#define MAX_LOG_MSG_LEN 256 - - -#include -#include "global.h" +#include "portab.h" -#include +#include "imp.h" #include +#include #include #include +#include +#include +#include + +#ifdef USE_SYSLOG #include +#endif + +#include "ngircd.h" +#include "client.h" +#include "defines.h" +#include "irc-write.h" -#include +#include "exp.h" #include "log.h" +LOCAL CHAR Error_File[FNAME_LEN]; +LOCAL CHAR Init_Txt[127]; + + +LOCAL VOID Wall_ServerNotice( CHAR *Msg ); + + GLOBAL VOID Log_Init( VOID ) { +#ifdef USE_SYSLOG + /* Syslog initialisieren */ openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 ); - Log( LOG_NOTICE, PACKAGE" version "VERSION" started."); +#endif + + /* Hello World! */ + Log( LOG_NOTICE, "%s started.", NGIRCd_Version( )); + + /* Informationen uebern den "Operation Mode" */ + strcpy( Init_Txt, "" ); +#ifdef DEBUG + if( NGIRCd_Debug ) + { + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "debug-mode" ); + } +#endif + if( NGIRCd_NoDaemon ) + { + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "no-daemon-mode" ); + } + if( NGIRCd_Passive ) + { + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "passive-mode" ); + } +#ifdef SNIFFER + if( NGIRCd_Sniffer ) + { + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "network sniffer" ); + } +#endif + if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt ); } /* Log_Init */ +GLOBAL VOID Log_InitErrorfile( VOID ) +{ + /* "Error-Log" initialisieren: stderr in Datei umlenken. Dort + * landen z.B. alle Ausgaben von assert()-Aufrufen. */ + + time_t t; + + 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; + } + + fputs( ctime( &t ), stderr ); + fprintf( stderr, "%s started.\n", NGIRCd_Version( )); + fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" ); + fflush( stderr ); +} /* Log_InitErrfile */ + + GLOBAL VOID Log_Exit( VOID ) { + /* Good Bye! */ Log( LOG_NOTICE, PACKAGE" done."); + + /* Error-File (stderr) loeschen */ + if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno )); + +#ifdef USE_SYSLOG + /* syslog abmelden */ closelog( ); +#endif } /* Log_Exit */ -GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... ) +GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... ) { /* Eintrag in Logfile(s) schreiben */ CHAR msg[MAX_LOG_MSG_LEN]; + BOOLEAN snotice; va_list ap; -#ifndef DEBUG + assert( Format != NULL ); + + if( Level & LOG_snotice ) + { + /* Notice an User mit "s" Mode */ + snotice = TRUE; + Level &= ~LOG_snotice; + } + else snotice = FALSE; + +#ifdef DEBUG + if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return; +#else if( Level == LOG_DEBUG ) return; #endif + /* String mit variablen Argumenten zusammenbauen ... */ + va_start( ap, Format ); + 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 ); +#endif + + /* lokale User mit "s"-Mode */ + if( snotice ) Wall_ServerNotice( msg ); +} /* Log */ + + +GLOBAL VOID Log_Init_Resolver( VOID ) +{ +#ifdef USE_SYSLOG + openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 ); +#endif +} /* Log_Init_Resolver */ + + +GLOBAL VOID Log_Exit_Resolver( VOID ) +{ +#ifdef USE_SYSLOG + closelog( ); +#endif +} /* Log_Exit_Resolver */ + + +GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... ) +{ + /* Eintrag des Resolver in Logfile(s) schreiben */ + +#ifndef USE_SYSLOG + return; +#else + + CHAR msg[MAX_LOG_MSG_LEN]; + va_list ap; + assert( Format != NULL ); +#ifdef DEBUG + if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return; +#else + if( Level == LOG_DEBUG ) return; +#endif + /* String mit variablen Argumenten zusammenbauen ... */ va_start( ap, Format ); - vsnprintf( msg, MAX_LOG_MSG_LEN - 1, Format, ap ); - msg[MAX_LOG_MSG_LEN - 1] = '\0'; + vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); + va_end( ap ); /* ... und ausgeben */ - printf( "[%d] %s\n", Level, msg ); syslog( Level, msg ); - va_end( ap ); -} /* Log */ +#endif +} /* Log_Resolver */ + + +LOCAL 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 ); + c = Client_Next( c ); + } +} /* Wall_ServerNotice */ /* -eof- */