- Error-Log wird nach User-Wechsel initialisiert: Log_InitErrorfile().

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 544f2430b8b2144609e4a91c043ee90c4f001a17..0ea5986d693cfe63db460d0a33ef5df7a8098132 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.26 2002/03/27 21:03:09 alex Exp $
+ * $Id: log.c,v 1.29 2002/03/29 23:33:42 alex Exp $
  *
  * log.c: Logging-Funktionen
  */
@@ -39,13 +39,15 @@
 #include "log.h"
 
 
+LOCAL CHAR Error_File[FNAME_LEN];
+LOCAL CHAR Init_Txt[127];
+
+
 LOCAL VOID Wall_ServerNotice( CHAR *Msg );
 
 
 GLOBAL VOID Log_Init( VOID )
 {
-       CHAR txt[127];
-
 #ifdef USE_SYSLOG
        /* Syslog initialisieren */
        openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
@@ -55,54 +57,64 @@ 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. */
+
+       time_t t;
 
-       /* stderr in Datei umlenken */
        fflush( stderr );
-       if( ! freopen( ERROR_FILE, "a+", stderr )) Log( LOG_ERR, "Can't reopen stderr (\""ERROR_FILE"\"): %s", strerror( errno ));
+       sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( ));
+       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 : "-" );
+       fputs( ctime( &t ), stderr );
+       fprintf( stderr, "%s started.\n", NGIRCd_Version( ));
+       fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
        fflush( stderr );
-} /* Log_Init */
+} /* Log_InitErrfile */
 
 
 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 );
+       /* 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 */
@@ -118,18 +130,16 @@ GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... )
        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;
@@ -142,14 +152,6 @@ GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... )
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       /* In Error-File schreiben */
-       if( Level <= LOG_ERR )
-       {
-               t = time( NULL );
-               fputs( ctime( &t ), stderr );
-               fprintf( stderr, "[%d] %s\n\n", Level, msg );
-       }
-
        /* Konsole */
        if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg );
 
@@ -212,10 +214,12 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 
 LOCAL VOID Wall_ServerNotice( CHAR *Msg )
 {
+       /* Server-Notice an entsprechende User verschicken */
+
        CLIENT *c;
 
        assert( Msg != NULL );
-       
+
        c = Client_First( );
        while( c )
        {