- das Error-File wird nun komplett durch das Log-Modul verwaltet, der

[ngircd-alex.git] / src / ngircd / log.c

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 18fe1edac318de9fe0851b84a6c2d847839ca7aa..5b3911a550701f223d9465495d0d12c2c8699cf8 100644 (file)
--- 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.25 2002/03/27 20:53:30 alex Exp $
+ * $Id: log.c,v 1.27 2002/03/29 20:59:22 alex Exp $
  *
  * log.c: Logging-Funktionen
  */
@@ -39,6 +39,9 @@
 #include "log.h"
 
 
+LOCAL CHAR Error_File[FNAME_LEN];
+
+
 LOCAL VOID Wall_ServerNotice( CHAR *Msg );
 
 
@@ -83,8 +86,9 @@ GLOBAL VOID Log_Init( VOID )
        if( txt[0] ) Log( LOG_INFO, "Activating: %s.", txt );
 
        /* stderr in Datei umlenken */
+       sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( ));
        fflush( stderr );
-       if( ! freopen( ERROR_FILE, "a+", stderr )) Log( LOG_ERR, "Can't reopen stderr (\""ERROR_FILE"\"): %s", strerror( errno ));
+       if( ! freopen( Error_File, "a+", stderr )) Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno ));
 
        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 : "-" );
@@ -104,6 +108,9 @@ GLOBAL VOID Log_Exit( VOID )
        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 */
        closelog( );
@@ -219,7 +226,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", Msg );
+               if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s", Client_ThisServer( ), Msg );
                c = Client_Next( c );
        }
 } /* Wall_ServerNotice */