mirror of
				https://github.com/osmarks/ngircd.git
				synced 2025-10-31 05:52:59 +00:00 
			
		
		
		
	Enhanced logging to console when running in "no-detached mode": added PID
and log messages of resolver sub-processes. [from HEAD]
This commit is contained in:
		| @@ -14,7 +14,7 @@ | ||||
|  | ||||
| #include "portab.h" | ||||
|  | ||||
| static char UNUSED id[] = "$Id: log.c,v 1.44.2.1 2004/05/07 11:24:18 alex Exp $"; | ||||
| static char UNUSED id[] = "$Id: log.c,v 1.44.2.2 2004/05/15 23:51:13 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 */ | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Alexander Barton
					Alexander Barton