#include "portab.h"
-static char UNUSED id[] = "$Id: log.c,v 1.55 2005/06/17 19:16:53 fw Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.57 2005/06/24 19:55:10 alex Exp $";
#include "imp.h"
#include <assert.h>
LOCAL char Init_Txt[127];
+LOCAL bool Is_Daemon;
#ifdef DEBUG
LOCAL char Error_File[FNAME_LEN];
GLOBAL void
-Log_Init( void )
+Log_Init( bool Daemon_Mode )
{
+ Is_Daemon = Daemon_Mode;
+
#ifdef SYSLOG
#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
#define LOG_CONS 0
strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt );
}
#endif
- if( NGIRCd_NoDaemon )
+ if( ! Is_Daemon )
{
if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt );
fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
fflush( stderr );
+#ifdef DEBUG
Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
+#endif
} /* Log_InitErrfile */
#endif
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
- if( NGIRCd_NoDaemon )
+ if( ! Is_Daemon )
{
/* auf Konsole ausgeben */
fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
#ifdef SYSLOG
openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif
+#ifdef DEBUG
Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
+#endif
} /* Log_Init_Resolver */
GLOBAL void
Log_Exit_Resolver( void )
{
+#ifdef DEBUG
Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+#endif
#ifdef SYSLOG
closelog( );
#endif
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
- /* Output */
- if( NGIRCd_NoDaemon )
+ if( ! Is_Daemon )
{
/* Output to console */
fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );