Module: ngircd.git Branch: master Commit: 790fa89e67afbea7025479aad0bd5ef9d384d909 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=790fa...
Author: Alexander Barton alex@barton.de Date: Wed Dec 1 21:22:20 2010 +0100
Remove "error file" when compiled with debug code enabled
The information written to the "error file" (/tmp/ngircd-<PID>.err) when ngIRCd is compiled with debug code enabled isn't that usefule, so don't create this file at all.
---
src/ngircd/log.c | 41 ----------------------------------------- src/ngircd/ngircd.c | 5 ----- 2 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 3710142..f68a0fb 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -45,10 +45,6 @@ static char Init_Txt[127]; static bool Is_Daemon;
-#ifdef DEBUG -static char Error_File[FNAME_LEN]; -#endif -
static void Log_Message(int Level, const char *msg) @@ -107,51 +103,14 @@ Log_Init( bool Daemon_Mode ) } #endif if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt ); - -#ifdef DEBUG - Error_File[0] = '\0'; -#endif } /* Log_Init */
-#ifdef DEBUG -GLOBAL void -Log_InitErrorfile( void ) -{ - snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( )); - - fflush( stderr ); - if( ! freopen( Error_File, "w", stderr )) - { - Log( LOG_ERR, "Can't reopen stderr ("%s"): %s", Error_File, strerror( errno )); - return; - } - - fputs( ctime( &NGIRCd_Start ), stderr ); - 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 ) { - /* Good Bye! */ Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME, NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted()); - -#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 SYSLOG closelog(); #endif diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index d4d4d5f..6dfd206 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -285,11 +285,6 @@ main( int argc, const char *argv[] ) #endif Conn_Init( );
-#ifdef DEBUG - /* Redirect stderr handle to "error file" for debugging - * when not running in "no daemon" mode: */ - if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( ); -#endif if (!io_library_init(CONNECTION_POOL)) { Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); exit(1);