albino/ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Handling des "Error-File" (stderr) geaendert.

Browse Source
This commit is contained in:
Alexander Barton 2002-03-29 22:55:42 +00:00
parent d47f88427d
commit 773d886df6
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ngircd/log.c
View File

@ -9,7 +9,7 @@
* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
* *
* $Id: log.c,v 1.27 2002/03/29 20:59:22 alex Exp $ * $Id: log.c,v 1.28 2002/03/29 22:55:42 alex Exp $
* *
* log.c: Logging-Funktionen * log.c: Logging-Funktionen
*/ */
@ -48,6 +48,7 @@ LOCAL VOID Wall_ServerNotice( CHAR *Msg );
GLOBAL VOID Log_Init( VOID ) GLOBAL VOID Log_Init( VOID )
{ {
CHAR txt[127]; CHAR txt[127];
time_t t;
#ifdef USE_SYSLOG #ifdef USE_SYSLOG
/* Syslog initialisieren */ /* Syslog initialisieren */
@ -85,29 +86,28 @@ GLOBAL VOID Log_Init( VOID )
#endif #endif
if( txt[0] ) Log( LOG_INFO, "Activating: %s.", txt ); if( txt[0] ) Log( LOG_INFO, "Activating: %s.", txt );
/* stderr in Datei umlenken */ /* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( )); * landen z.B. alle Ausgaben von assert()-Aufrufen. */
fflush( stderr ); fflush( stderr );
if( ! freopen( Error_File, "a+", stderr )) Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno )); sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( ));
if( ! freopen( Error_File, "w", stderr ))
{
Log( LOG_ERR, "Can't reopen stderr (\"%s\"): %s", Error_File, strerror( errno ));
return;
}
fprintf( stderr, "\n--- %s ---\n\n", NGIRCd_StartStr ); fputs( ctime( &t ), stderr );
fprintf( stderr, "%s started.\npid=%ld, ppid=%ld, uid=%ld, gid=%ld [euid=%ld, egid=%ld].\nActivating: %s\n\n", NGIRCd_Version( ), (INT32)getpid( ), (INT32)getppid( ), (INT32)getuid( ), (INT32)getgid( ), (INT32)geteuid( ), (INT32)getegid( ), txt[0] ? txt : "-" ); fprintf( stderr, "%s started.\n", NGIRCd_Version( ));
fprintf( stderr, "Activating: %s\n\n", txt[0] ? txt : "-" );
fflush( stderr ); fflush( stderr );
} /* Log_Init */ } /* Log_Init */
GLOBAL VOID Log_Exit( VOID ) GLOBAL VOID Log_Exit( VOID )
{ {
time_t t;
/* Good Bye! */ /* Good Bye! */
Log( LOG_NOTICE, PACKAGE" done."); Log( LOG_NOTICE, PACKAGE" done.");
t = time( NULL );
fputs( ctime( &t ), stderr );
fprintf( stderr, PACKAGE" done (pid=%ld).\n", (INT32)getpid( ));
fflush( stderr );
/* Error-File (stderr) loeschen */ /* Error-File (stderr) loeschen */
if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno )); if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
@ -125,18 +125,16 @@ GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... )
CHAR msg[MAX_LOG_MSG_LEN]; CHAR msg[MAX_LOG_MSG_LEN];
BOOLEAN snotice; BOOLEAN snotice;
va_list ap; va_list ap;
time_t t;
assert( Format != NULL ); assert( Format != NULL );
snotice = FALSE;
if( Level & LOG_snotice ) if( Level & LOG_snotice )
{ {
/* Notice an User mit "s" Mode */ /* Notice an User mit "s" Mode */
snotice = TRUE; snotice = TRUE;
Level &= ~LOG_snotice; Level &= ~LOG_snotice;
} }
else snotice = FALSE;
#ifdef DEBUG #ifdef DEBUG
if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return; if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
@ -149,14 +147,6 @@ GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... )
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap ); va_end( ap );
/* In Error-File schreiben */
if( Level <= LOG_ERR )
{
t = time( NULL );
fputs( ctime( &t ), stderr );
fprintf( stderr, "[%d] %s\n\n", Level, msg );
}
/* Konsole */ /* Konsole */
if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg ); if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg );
@ -219,6 +209,8 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
LOCAL VOID Wall_ServerNotice( CHAR *Msg ) LOCAL VOID Wall_ServerNotice( CHAR *Msg )
{ {
/* Server-Notice an entsprechende User verschicken */
CLIENT *c; CLIENT *c;
assert( Msg != NULL ); assert( Msg != NULL );