X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=9e226a5ad0e7e639225d40b2c327a704e6e10df2;hp=5b3911a550701f223d9465495d0d12c2c8699cf8;hb=62796722f13d0291212a222c5699ac20cf533501;hpb=1c00ddffec83f60c37e5f1885b08256d563c6464

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 5b3911a5..9e226a5a 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -2,21 +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.27 2002/03/29 20:59:22 alex Exp $
- *
- * log.c: Logging-Funktionen
+ * Logging functions
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: log.c,v 1.43 2003/03/31 15:54:21 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -31,8 +30,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"
@@ -40,73 +41,86 @@
 
 
 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 )
 {
-	CHAR txt[127];
-
 #ifdef USE_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 );
+} /* 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_NAME, (LONG)getpid( ));
 
-	/* stderr in Datei umlenken */
-	sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( ));
+	/* stderr umlenken */
 	fflush( stderr );
-	if( ! freopen( Error_File, "a+", stderr )) Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, 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.");
-
-	t = time( NULL );
-	fputs( ctime( &t ), stderr );
-	fprintf( stderr, PACKAGE" done (pid=%ld).\n", (INT32)getpid( ));
-	fflush( stderr );
+	if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
+	else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
 
 	/* Error-File (stderr) loeschen */
 	if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
@@ -118,25 +132,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;
@@ -145,40 +166,54 @@ 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 );
-
 #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 );
+	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
 	closelog( );
@@ -186,7 +221,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,6 +243,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
@@ -206,7 +252,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 );
 
@@ -217,16 +267,19 @@ 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 )
 	{
-		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 */