X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=c8a5e477a89bcb0178a27157077c3d9d55440175;hp=4cabca7c5a04d7273eefaf56ad36a1699a0784a5;hb=c7b55aa6f45b75b52fb67419b7ca5af3940016a4;hpb=d68fb7a320496897cbc5e0a86ab00b7cdce2b58b

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 4cabca7c..c8a5e477 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -9,7 +9,7 @@
  * 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.30 2002/03/29 23:58:10 alex Exp $
+ * $Id: log.c,v 1.40 2002/10/09 16:53:02 alex Exp $
  *
  * log.c: Logging-Funktionen
  */
@@ -31,8 +31,10 @@
 #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"
@@ -43,10 +45,11 @@ LOCAL CHAR Error_File[FNAME_LEN];
 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 */
@@ -86,30 +89,39 @@ GLOBAL VOID Log_Init( VOID )
 } /* 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. */
 
+	/* Dateiname zusammen bauen */
+	sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (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, "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 ));
@@ -121,7 +133,16 @@ GLOBAL VOID Log_Exit( VOID )
 } /* 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 */
 
@@ -146,24 +167,45 @@ 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 );
-
+	if( NGIRCd_NoDaemon )
+	{
+		/* auf Konsole ausgeben */
+		fprintf( stdout, "[%d] %s\n", Level, msg );
+		fflush( stdout );
+	}
 #ifdef USE_SYSLOG
-	/* Syslog */
-	syslog( Level, msg );
+	else
+	{
+		/* Syslog */
+		syslog( Level, "%s", msg );
+	}
 #endif
 
-	/* lokale User mit "s"-Mode */
-	if( snotice ) Wall_ServerNotice( msg );
+	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 );
@@ -171,7 +213,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( );
@@ -179,7 +222,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 */
 
@@ -192,6 +244,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
@@ -199,7 +253,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 );
 
@@ -210,7 +268,8 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 } /* Log_Resolver */
 
 
-LOCAL VOID Wall_ServerNotice( CHAR *Msg )
+LOCAL VOID
+Wall_ServerNotice( CHAR *Msg )
 {
 	/* Server-Notice an entsprechende User verschicken */
 
@@ -221,7 +280,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 */