X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=cb149939b789db792419481e2c74545ba3897f51;hp=394817b0277de1a070141cb84f88b0657888975e;hb=7281b8dd4d917f8b7f7c36460b78b686427ce973;hpb=ca33cbda05902b0009058d369f88c0a7a43b1bbe diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 394817b0..cb149939 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -2,24 +2,20 @@ * 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.21 2002/03/12 14:37:52 alex Exp $ - * - * log.c: Logging-Funktionen + * Logging functions */ -#define MAX_LOG_MSG_LEN 256 - - #include "portab.h" +static char UNUSED id[] = "$Id: log.c,v 1.45 2004/05/07 11:19:21 alex Exp $"; + #include "imp.h" #include #include @@ -29,90 +25,145 @@ #include #include -#ifdef USE_SYSLOG +#ifdef SYSLOG #include #endif #include "ngircd.h" #include "defines.h" +#include "conn.h" +#include "client.h" +#include "channel.h" +#include "irc-write.h" #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 )); -#ifdef USE_SYSLOG + +GLOBAL VOID +Log_Init( VOID ) +{ +#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( )); /* 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 ); + + Error_File[0] = '\0'; +} /* Log_Init */ + + +GLOBAL VOID +Log_InitErrorfile( VOID ) +{ + /* "Error-Log" initialisieren: stderr in Datei umlenken. Dort + * landen z.B. alle Ausgaben von assert()-Aufrufen. */ - /* stderr in Datei umlenken */ + /* Dateiname zusammen bauen */ + sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (LONG)getpid( )); + + /* stderr umlenken */ fflush( stderr ); - if( ! freopen( ERROR_FILE, "a+", stderr )) Log( LOG_ERR, "Can't reopen stderr (\""ERROR_FILE"\"): %s", strerror( errno )); + if( ! freopen( Error_File, "w", stderr )) + { + Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno )); + return; + } - fprintf( stderr, "\n--- %s ---\n\n", NGIRCd_StartStr ); - fprintf( stderr, "%s started.\npid=%d, ppid=%d, uid=%d, gid=%d [euid=%d, egid=%d].\nActivating: %s\n\n", NGIRCd_Version( ), getpid( ), getppid( ), getuid( ), getgid( ), geteuid( ), getegid( ), txt[0] ? txt : "-" ); + /* 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_Init */ + Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File ); +} /* Log_InitErrfile */ -GLOBAL VOID Log_Exit( VOID ) + +GLOBAL VOID +Log_Exit( VOID ) { /* Good Bye! */ - Log( LOG_NOTICE, PACKAGE" done."); - fprintf( stderr, PACKAGE" done (pid=%d).\n", getpid( )); - fflush( stderr ); + if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME ); + else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME ); + + 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 )); + } -#ifdef USE_SYSLOG +#ifdef SYSLOG /* syslog abmelden */ closelog( ); #endif } /* 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 @@ -120,44 +171,75 @@ 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 ); - /* In Error-File schreiben */ - if( Level <= LOG_ERR ) fprintf( stderr, "[%d] %s\n", Level, msg ); + if( NGIRCd_NoDaemon ) + { + /* auf Konsole ausgeben */ + fprintf( stdout, "[%d] %s\n", Level, msg ); + fflush( stdout ); + } +#ifdef SYSLOG + else + { + /* Syslog */ + syslog( Level, "%s", msg ); + } +#endif - /* ... und ausgeben */ - if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg ); + if( Level <= LOG_CRIT ) + { + /* Kritische Meldungen in Error-File (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 */ + 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_Init_Resolver */ -GLOBAL VOID Log_Exit_Resolver( VOID ) +GLOBAL VOID +Log_Exit_Resolver( VOID ) { -#ifdef USE_SYSLOG +#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 +#ifndef SYSLOG return; #else @@ -166,6 +248,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 @@ -173,7 +257,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 ); @@ -184,4 +272,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- */