#include "portab.h"
-static char UNUSED id[] = "$Id: log.c,v 1.42 2002/12/19 04:30:00 alex Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.53 2005/03/19 18:43:49 fw 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>
#include <unistd.h>
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
#include <syslog.h>
#endif
#include "log.h"
-LOCAL CHAR Error_File[FNAME_LEN];
-LOCAL CHAR Init_Txt[127];
+LOCAL char Init_Txt[127];
+
+#ifdef DEBUG
+LOCAL char Error_File[FNAME_LEN];
+#endif
-LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
+LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
-GLOBAL VOID
-Log_Init( VOID )
+GLOBAL void
+Log_Init( void )
{
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
/* Syslog initialisieren */
- openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+ openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif
/* Hello World! */
- Log( LOG_NOTICE, "%s started.", NGIRCd_Version( ));
+ 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 )
}
#endif
if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
+
+#ifdef DEBUG
+ Error_File[0] = '\0';
+#endif
} /* Log_Init */
-GLOBAL VOID
-Log_InitErrorfile( VOID )
+#ifdef DEBUG
+
+GLOBAL void
+Log_InitErrorfile( void )
{
/* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
* landen z.B. alle Ausgaben von assert()-Aufrufen. */
/* Dateiname zusammen bauen */
- sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (LONG)getpid( ));
+ sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
/* stderr umlenken */
fflush( stderr );
/* Einige Infos in das Error-File schreiben */
fputs( ctime( &NGIRCd_Start ), stderr );
- fprintf( stderr, "%s started.\n", NGIRCd_Version( ));
+ fprintf( stderr, "%s started.\n", NGIRCd_Version );
fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
fflush( stderr );
Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
} /* Log_InitErrfile */
+#endif
+
-GLOBAL VOID
-Log_Exit( VOID )
+GLOBAL void
+Log_Exit( void )
{
/* Good Bye! */
- if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE );
- else Log( LOG_NOTICE, "%s done.", PACKAGE );
+ 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 ));
+#ifdef DEBUG
+ 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 ));
+ }
+#endif
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
/* syslog abmelden */
closelog( );
#endif
#ifdef PROTOTYPES
-GLOBAL VOID
-Log( INT Level, CONST CHAR *Format, ... )
+GLOBAL void
+Log( int Level, const char *Format, ... )
#else
-GLOBAL VOID
+GLOBAL void
Log( Level, Format, va_alist )
-INT Level;
-CONST CHAR *Format;
+int Level;
+const char *Format;
va_dcl
#endif
{
/* Eintrag in Logfile(s) schreiben */
- CHAR msg[MAX_LOG_MSG_LEN];
- BOOLEAN snotice;
+ char msg[MAX_LOG_MSG_LEN];
+ bool snotice;
va_list ap;
assert( Format != NULL );
if( Level & LOG_snotice )
{
/* Notice an User mit "s" Mode */
- snotice = TRUE;
+ snotice = true;
Level &= ~LOG_snotice;
}
- else snotice = FALSE;
+ else snotice = false;
#ifdef DEBUG
if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
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 USE_SYSLOG
+#ifdef SYSLOG
else
{
/* Syslog */
if( Level <= LOG_CRIT )
{
- /* Kritische Meldungen in Error-File (stderr) */
+ /* log critical messages to stderr */
fprintf( stderr, "%s\n", msg );
fflush( stderr );
}
} /* Log */
-GLOBAL VOID
-Log_Init_Resolver( VOID )
+GLOBAL void
+Log_Init_Resolver( void )
{
-#ifdef USE_SYSLOG
- openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+#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 )
+GLOBAL void
+Log_Exit_Resolver( void )
{
-#ifdef USE_SYSLOG
+ Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+#ifdef SYSLOG
closelog( );
#endif
} /* Log_Exit_Resolver */
#ifdef PROTOTYPES
-GLOBAL VOID
-Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+GLOBAL void
+Log_Resolver( const int Level, const char *Format, ... )
#else
-GLOBAL VOID
+GLOBAL void
Log_Resolver( Level, Format, va_alist )
-CONST INT Level;
-CONST CHAR *Format;
+const int Level;
+const char *Format;
va_dcl
#endif
{
/* Eintrag des Resolver in Logfile(s) schreiben */
-#ifndef USE_SYSLOG
- return;
-#else
-
- CHAR msg[MAX_LOG_MSG_LEN];
+ 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
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 */
-LOCAL VOID
-Wall_ServerNotice( CHAR *Msg )
+LOCAL void
+Wall_ServerNotice( char *Msg )
{
/* Server-Notice an entsprechende User verschicken */
projects / ngircd-alex.git / blobdiff