- 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 452c045e7606fc20eeed402287197001be859c01..5b3911a550701f223d9465495d0d12c2c8699cf8 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -9,15 +9,12 @@
  * 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.22 2002/03/21 12:00:23 alex Exp $
+ * $Id: log.c,v 1.27 2002/03/29 20:59:22 alex Exp $
  *
  * log.c: Logging-Funktionen
  */
 
 
-#define MAX_LOG_MSG_LEN 256
-
-
 #include "portab.h"
 
 #include "imp.h"
@@ -34,12 +31,20 @@
 #endif
 
 #include "ngircd.h"
+#include "client.h"
 #include "defines.h"
+#include "irc-write.h"
 
 #include "exp.h"
 #include "log.h"
 
 
+LOCAL CHAR Error_File[FNAME_LEN];
+
+
+LOCAL VOID Wall_ServerNotice( CHAR *Msg );
+
+
 GLOBAL VOID Log_Init( VOID )
 {
        CHAR txt[127];
@@ -81,11 +86,12 @@ 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=%d, ppid=%d, uid=%d, gid=%d [euid=%d, egid=%d].\nActivating: %s\n\n", NGIRCd_Version( ), getpid( ), getppid( ), getuid( ), getgid( ), geteuid( ), getegid( ), txt[0] ? txt : "-" );
+       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 : "-" );
        fflush( stderr );
 } /* Log_Init */
 
@@ -99,9 +105,12 @@ GLOBAL VOID Log_Exit( VOID )
 
        t = time( NULL );
        fputs( ctime( &t ), stderr );
-       fprintf( stderr, PACKAGE" done (pid=%d).\n", getpid( ));
+       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( );
@@ -109,16 +118,26 @@ GLOBAL VOID Log_Exit( VOID )
 } /* Log_Exit */
 
 
-GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
+GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... )
 {
        /* 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;
+       }
+
 #ifdef DEBUG
        if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
 #else
@@ -138,13 +157,16 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
                fprintf( stderr, "[%d] %s\n\n", Level, msg );
        }
 
-       /* ... und ausgeben */
+       /* Konsole */
        if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg );
 
 #ifdef USE_SYSLOG
        /* Syslog */
        syslog( Level, msg );
 #endif
+
+       /* lokale User mit "s"-Mode */
+       if( snotice ) Wall_ServerNotice( msg );
 } /* Log */
 
 
@@ -195,4 +217,19 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 } /* Log_Resolver */
 
 
+LOCAL VOID Wall_ServerNotice( CHAR *Msg )
+{
+       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 );
+               c = Client_Next( c );
+       }
+} /* Wall_ServerNotice */
+
+
 /* -eof- */