Added an empty /etc/ngircd/ngircd.motd to the packages. And ngircd.conf

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 1c8d2c7b3e1b52ab37b6b14cb88568d63d434212..ec284269cdbbe8870135cde6b0afbf3234c3d0a3 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,12 +14,16 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.44 2003/12/26 15:55:07 alex Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.50 2005/02/03 09:26:42 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
-#include <stdarg.h>
+#ifdef PROTOTYPES
+#      include <stdarg.h>
+#else
+#      include <varargs.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -59,12 +63,11 @@ Log_Init( VOID )
        Log( LOG_NOTICE, "%s started.", NGIRCd_Version( ));
          
        /* Informationen uebern den "Operation Mode" */
-       strcpy( Init_Txt, "" );
+       Init_Txt[0] = '\0';
 #ifdef DEBUG
        if( NGIRCd_Debug )
        {
-               if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-               strcat( Init_Txt, "debug-mode" );
+               strcpy( Init_Txt, "debug-mode" );
        }
 #endif
        if( NGIRCd_NoDaemon )
@@ -85,6 +88,8 @@ Log_Init( VOID )
        }
 #endif
        if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
+
+       Error_File[0] = '\0';
 } /* Log_Init */
 
 
@@ -122,8 +127,11 @@ Log_Exit( VOID )
        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 ));
+       if( Error_File[0] )
+       {
+               /* Error-File (stderr) loeschen */
+               if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
+       }
 
 #ifdef SYSLOG
        /* syslog abmelden */
@@ -177,7 +185,7 @@ va_dcl
        if( NGIRCd_NoDaemon )
        {
                /* auf Konsole ausgeben */
-               fprintf( stdout, "[%d] %s\n", Level, msg );
+               fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
                fflush( stdout );
        }
 #ifdef SYSLOG
@@ -209,12 +217,14 @@ Log_Init_Resolver( VOID )
 #ifdef SYSLOG
        openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
+       Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
 } /* Log_Init_Resolver */
 
 
 GLOBAL VOID
 Log_Exit_Resolver( VOID )
 {
+       Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
 #ifdef SYSLOG
        closelog( );
 #endif
@@ -234,17 +244,11 @@ va_dcl
 {
        /* Eintrag des Resolver in Logfile(s) schreiben */
 
-#ifndef SYSLOG
-       return;
-#else
-
        CHAR msg[MAX_LOG_MSG_LEN];
        va_list ap;
 
        assert( Format != NULL );
 
-       if( NGIRCd_NoDaemon ) return;
-
 #ifdef DEBUG
        if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
 #else
@@ -260,9 +264,15 @@ va_dcl
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
-       /* ... und ausgeben */
-       syslog( Level, msg );
-
+       /* Output */
+       if( NGIRCd_NoDaemon )
+       {
+               /* Output to console */
+               fprintf( stdout, "[%d:%d] %s\n", (INT)getpid( ), Level, msg );
+               fflush( stdout );
+       }
+#ifdef SYSLOG
+       else syslog( Level, "%s", msg );
 #endif
 } /* Log_Resolver */