X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=db0f076795c4c2f485533b6b7cf5633363c4b2ae;hb=43d9a62473338cd9e711b395e79c943f6e9857f2;hp=cc647a0c51c0dfeeb2650a88713244deef2bec8d;hpb=10363b398e05604d2318c67b943e7a742cb25323;p=ngircd-alex.git diff --git a/src/ngircd/log.c b/src/ngircd/log.c index cc647a0c..db0f0767 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -2,106 +2,54 @@ * 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.19 2002/03/03 17:17:01 alex Exp $ - * - * log.c: Logging-Funktionen - * - * $Log: log.c,v $ - * Revision 1.19 2002/03/03 17:17:01 alex - * - strncpy() und vsnprintf() kopieren nun etwas "optimierter" (1 Byte weniger) :-) - * - * Revision 1.18 2002/02/19 20:07:13 alex - * - direkt nach dem Start werden die aktiven "Modes" ins Log geschrieben. - * - * Revision 1.17 2002/01/11 14:45:37 alex - * - Anpassungen an neue Kommandozeilen-Optionen "--debug" und "--nodaemon". - * - * Revision 1.16 2002/01/05 15:54:40 alex - * - syslog() etc. wurde verwendet, auch wenn USE_SYSLOG nicht definiert war. - * - * Revision 1.15 2002/01/02 02:42:58 alex - * - Copyright-Texte aktualisiert. - * - * Revision 1.14 2002/01/01 18:01:43 alex - * - Architektur und Betriebssystem in Start-Meldung aufgenommen. - * - * Revision 1.13 2001/12/31 02:18:51 alex - * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART), - * - neuen Header "defines.h" mit (fast) allen Konstanten. - * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes. - * - * Revision 1.12 2001/12/29 20:16:31 alex - * - Log-Funktionen fuer Resolver-Sub-Prozess implementiert. - * - * Revision 1.11 2001/12/29 03:08:49 alex - * - neue configure-Option "--enable-strict-rfc". - * - * Revision 1.10 2001/12/27 01:44:49 alex - * - die Verwendung von syslog kann nun abgeschaltet werden. - * - * Revision 1.9 2001/12/26 03:22:16 alex - * - string.h wird nun includiert. - * - * Revision 1.8 2001/12/25 23:13:00 alex - * - Versionsstring bei Programmstart verbessert. - * - * 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. + * Logging functions */ -#define MAX_LOG_MSG_LEN 256 - +#include "portab.h" -#include -#include "global.h" +static char UNUSED id[] = "$Id: log.c,v 1.42 2002/12/19 04:30:00 alex Exp $"; -#include +#include "imp.h" #include +#include #include #include #include +#include +#include #ifdef USE_SYSLOG #include #endif -#include "global.h" #include "ngircd.h" +#include "defines.h" +#include "conn.h" +#include "client.h" +#include "channel.h" +#include "irc-write.h" -#include +#include "exp.h" #include "log.h" -GLOBAL VOID Log_Init( VOID ) -{ - CHAR txt[127]; +LOCAL CHAR Error_File[FNAME_LEN]; +LOCAL CHAR Init_Txt[127]; + +LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg )); + + +GLOBAL VOID +Log_Init( VOID ) +{ #ifdef USE_SYSLOG /* Syslog initialisieren */ openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 ); @@ -109,42 +57,74 @@ GLOBAL VOID Log_Init( VOID ) /* Hello World! */ Log( LOG_NOTICE, "%s started.", NGIRCd_Version( )); - + /* Informationen uebern den "Operation Mode" */ - strcpy( txt, "" ); + strcpy( Init_Txt, "" ); #ifdef DEBUG if( NGIRCd_Debug ) { - if( txt[0] ) strcat( txt, ", " ); - strcat( txt, "debug-mode" ); + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "debug-mode" ); } #endif if( NGIRCd_NoDaemon ) { - if( txt[0] ) strcat( txt, ", " ); - strcat( txt, "no-daemon-mode" ); + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "no-daemon-mode" ); } if( NGIRCd_Passive ) { - if( txt[0] ) strcat( txt, ", " ); - strcat( txt, "passive-mode" ); + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "passive-mode" ); } #ifdef SNIFFER if( NGIRCd_Sniffer ) { - if( txt[0] ) strcat( txt, ", " ); - strcat( txt, "network sniffer" ); + if( Init_Txt[0] ) strcat( Init_Txt, ", " ); + strcat( Init_Txt, "network sniffer" ); } #endif - if( txt[0] ) Log( LOG_INFO, "Activating: %s.", txt ); + if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt ); } /* Log_Init */ -GLOBAL VOID Log_Exit( VOID ) +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, (LONG)getpid( )); + + /* stderr umlenken */ + fflush( stderr ); + 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, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" ); + fflush( stderr ); + + Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File ); +} /* Log_InitErrfile */ + + +GLOBAL VOID +Log_Exit( VOID ) { /* Good Bye! */ - Log( LOG_NOTICE, PACKAGE" done."); - + if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE ); + else Log( LOG_NOTICE, "%s done.", PACKAGE ); + + /* 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( ); @@ -152,15 +132,33 @@ GLOBAL VOID Log_Exit( VOID ) } /* Log_Exit */ -GLOBAL VOID Log( CONST 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; va_list ap; 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 @@ -168,19 +166,45 @@ GLOBAL VOID Log( 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 */ - if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg ); + if( NGIRCd_NoDaemon ) + { + /* auf Konsole ausgeben */ + fprintf( stdout, "[%d] %s\n", Level, msg ); + fflush( stdout ); + } #ifdef USE_SYSLOG - syslog( Level, msg ); + else + { + /* Syslog */ + syslog( Level, "%s", msg ); + } #endif + + if( Level <= LOG_CRIT ) + { + /* Kritische Meldungen in Error-File (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 ); @@ -188,7 +212,8 @@ GLOBAL VOID Log_Init_Resolver( VOID ) } /* Log_Init_Resolver */ -GLOBAL VOID Log_Exit_Resolver( VOID ) +GLOBAL VOID +Log_Exit_Resolver( VOID ) { #ifdef USE_SYSLOG closelog( ); @@ -196,7 +221,16 @@ GLOBAL VOID Log_Exit_Resolver( VOID ) } /* 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 */ @@ -209,6 +243,8 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... ) assert( Format != NULL ); + if( NGIRCd_NoDaemon ) return; + #ifdef DEBUG if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return; #else @@ -216,7 +252,11 @@ 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 ); @@ -227,4 +267,22 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... ) } /* 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%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg ); + c = Client_Next( c ); + } +} /* Wall_ServerNotice */ + + /* -eof- */