diff options
| author | Alexander Barton <alex@barton.de> | 2004-05-10 23:57:46 +0000 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2004-05-10 23:57:46 +0000 |
| commit | 26390c60fbc80dc74bb20ae6360911bfe09088c7 (patch) | |
| tree | 56c711321967994bc1a1fbd41feb0dc5936d9e04 /src | |
| parent | cdb039672cf3cda3ff33c1f899161e6365608320 (diff) | |
| download | ngircd-26390c60fbc80dc74bb20ae6360911bfe09088c7.tar.gz ngircd-26390c60fbc80dc74bb20ae6360911bfe09088c7.zip | |
Added PID to all log messages on the console; enhanced logging of
resolver sub-processes in debug mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/log.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/ngircd/log.c b/src/ngircd/log.c index cb149939..6017841f 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: log.c,v 1.45 2004/05/07 11:19:21 alex Exp $"; +static char UNUSED id[] = "$Id: log.c,v 1.46 2004/05/10 23:57:46 alex Exp $"; #include "imp.h" #include <assert.h> @@ -182,7 +182,7 @@ va_dcl if( NGIRCd_NoDaemon ) { /* auf Konsole ausgeben */ - fprintf( stdout, "[%d] %s\n", Level, msg ); + fprintf( stdout, "[%d:%d] %s\n", getpid( ), Level, msg ); fflush( stdout ); } #ifdef SYSLOG @@ -214,12 +214,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 @@ -239,17 +241,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 @@ -265,9 +261,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", getpid( ), Level, msg ); + fflush( stdout ); + } +#ifdef SYSLOG + else syslog( Level, msg ); #endif } /* Log_Resolver */ |