X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=9708eadc3f8f342f1171caa64cc4861a07f8f90e;hp=544f2430b8b2144609e4a91c043ee90c4f001a17;hb=40ebd4704a04a01be9e36fdbbff5e0c93b2bc71d;hpb=da8da1ce7df27231cb91b278ad1eda1721b7168d

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 544f2430..9708eadc 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.26 2002/03/27 21:03:09 alex Exp $
+ * $Id: log.c,v 1.36 2002/09/03 17:25:45 alex Exp $
  *
  * log.c: Logging-Funktionen
  */
@@ -31,21 +31,26 @@
 #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"
 #include "log.h"
 
 
-LOCAL VOID Wall_ServerNotice( CHAR *Msg );
+LOCAL CHAR Error_File[FNAME_LEN];
+LOCAL CHAR Init_Txt[127];
 
 
-GLOBAL VOID Log_Init( VOID )
-{
-	CHAR 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 );
@@ -55,54 +60,71 @@ GLOBAL VOID Log_Init( VOID )
 	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_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, (INT32)getpid( ));
 
-	/* stderr in Datei umlenken */
+	/* 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=%ld, ppid=%ld, uid=%ld, gid=%ld [euid=%ld, egid=%ld].\nActivating: %s\n\n", NGIRCd_Version( ), (INT32)getpid( ), (INT32)getppid( ), (INT32)getuid( ), (INT32)getgid( ), (INT32)geteuid( ), (INT32)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 )
 {
-	time_t t;
-	
 	/* Good Bye! */
-	Log( LOG_NOTICE, PACKAGE" done.");
+	if( NGIRCd_Restart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE );
+	else Log( LOG_NOTICE, "%s done.", PACKAGE );
 
-	t = time( NULL );
-	fputs( ctime( &t ), stderr );
-	fprintf( stderr, PACKAGE" done (pid=%ld).\n", (INT32)getpid( ));
-	fflush( stderr );
+	/* 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 */
@@ -111,25 +133,32 @@ 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 */
 
 	CHAR msg[MAX_LOG_MSG_LEN];
 	BOOLEAN snotice;
 	va_list ap;
-	time_t t;
 
 	assert( Format != NULL );
 
-	snotice = FALSE;
-
 	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;
@@ -138,32 +167,43 @@ 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 );
 
-	/* In Error-File schreiben */
-	if( Level <= LOG_ERR )
+	if( NGIRCd_NoDaemon )
 	{
-		t = time( NULL );
-		fputs( ctime( &t ), stderr );
-		fprintf( stderr, "[%d] %s\n\n", Level, msg );
+		/* auf Konsole ausgeben */
+		fprintf( stdout, "[%d] %s\n", Level, msg );
+		fflush( stdout );
 	}
 
-	/* Konsole */
-	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
 
-	/* 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 );
@@ -171,7 +211,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 +220,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 */
 
@@ -199,7 +249,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,12 +264,15 @@ 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 */
+
 	CLIENT *c;
 
 	assert( Msg != NULL );
-	
+
 	c = Client_First( );
 	while( c )
 	{