X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=d1678660498a6a0871c8b7434a849d6d08b81d38;hb=69b05aca38b52fe4a5165658b210a66fb026d4bf;hp=d387a723600cfeb11fbd61d6a14f531db2af0450;hpb=773d886df66e11359e840f42899aee21d03b34e5;p=ngircd-alex.git

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index d387a723..d1678660 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.28 2002/03/29 22:55:42 alex Exp $
+ * $Id: log.c,v 1.32 2002/03/31 16:46:15 alex Exp $
  *
  * log.c: Logging-Funktionen
  */
@@ -40,6 +40,7 @@
 
 
 LOCAL CHAR Error_File[FNAME_LEN];
+LOCAL CHAR Init_Txt[127];
 
 
 LOCAL VOID Wall_ServerNotice( CHAR *Msg );
@@ -47,9 +48,6 @@ LOCAL VOID Wall_ServerNotice( CHAR *Msg );
 
 GLOBAL VOID Log_Init( VOID )
 {
-	CHAR txt[127];
-	time_t t;
-
 #ifdef USE_SYSLOG
 	/* Syslog initialisieren */
 	openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
@@ -59,48 +57,59 @@ 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. */
-	fflush( stderr );
+
+	/* Dateiname zusammen bauen */
 	sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)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;
 	}
 
-	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", txt[0] ? txt : "-" );
+	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 )
@@ -147,16 +156,29 @@ GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... )
 	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 */
+		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 */