* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: log.c,v 1.29 2002/03/29 23:33:42 alex Exp $
+ * $Id: log.c,v 1.36 2002/09/03 17:25:45 alex Exp $
*
* log.c: Logging-Funktionen
*/
#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"
LOCAL CHAR Init_Txt[127];
-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
/* Syslog initialisieren */
} /* Log_Init */
-GLOBAL VOID Log_InitErrorfile( VOID )
+GLOBAL VOID
+Log_InitErrorfile( VOID )
{
/* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
* landen z.B. alle Ausgaben von assert()-Aufrufen. */
- time_t t;
+ /* Dateiname zusammen bauen */
+ sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (INT32)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;
}
- fputs( ctime( &t ), stderr );
+ /* 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 )
+GLOBAL VOID
+Log_Exit( VOID )
{
/* Good Bye! */
- Log( LOG_NOTICE, PACKAGE" done.");
+ if( NGIRCd_Restart ) 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 ));
} /* 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 */
#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 );
+ if( NGIRCd_NoDaemon )
+ {
+ /* auf Konsole ausgeben */
+ fprintf( stdout, "[%d] %s\n", Level, msg );
+ fflush( stdout );
+ }
+
+ 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
- /* lokale User mit "s"-Mode */
- if( snotice ) Wall_ServerNotice( msg );
+ 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 );
} /* Log_Init_Resolver */
-GLOBAL VOID Log_Exit_Resolver( VOID )
+GLOBAL VOID
+Log_Exit_Resolver( VOID )
{
#ifdef USE_SYSLOG
closelog( );
} /* 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 */
#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 );
} /* Log_Resolver */
-LOCAL VOID Wall_ServerNotice( CHAR *Msg )
+LOCAL VOID
+Wall_ServerNotice( CHAR *Msg )
{
/* Server-Notice an entsprechende User verschicken */