New "chroot" feature (from Benjamin Pineau), introducing new configuration

[ngircd-alex.git] / src / ngircd / log.c

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 63ebd9bf5c4b3bfa3c2f17df64aab70b4f1c5c99..cb149939b789db792419481e2c74545ba3897f51 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -2,21 +2,20 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: log.c,v 1.34 2002/05/30 16:52:21 alex Exp $
- *
- * log.c: Logging-Funktionen
+ * Logging functions
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: log.c,v 1.45 2004/05/07 11:19:21 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -26,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
 #include <syslog.h>
 #endif
 
@@ -51,9 +50,9 @@ LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
 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! */
@@ -86,6 +85,8 @@ Log_Init( VOID )
        }
 #endif
        if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
+
+       Error_File[0] = '\0';
 } /* Log_Init */
 
 
@@ -96,7 +97,7 @@ Log_InitErrorfile( VOID )
         * landen z.B. alle Ausgaben von assert()-Aufrufen. */
 
        /* Dateiname zusammen bauen */
-       sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (INT32)getpid( ));
+       sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (LONG)getpid( ));
 
        /* stderr umlenken */
        fflush( stderr );
@@ -120,12 +121,16 @@ GLOBAL VOID
 Log_Exit( VOID )
 {
        /* Good Bye! */
-       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 ));
+       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 ));
+       }
 
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
        /* syslog abmelden */
        closelog( );
 #endif
@@ -177,8 +182,16 @@ va_dcl
        if( NGIRCd_NoDaemon )
        {
                /* auf Konsole ausgeben */
-               printf( "[%d] %s\n", Level, msg );
+               fprintf( stdout, "[%d] %s\n", Level, msg );
+               fflush( stdout );
+       }
+#ifdef SYSLOG
+       else
+       {
+               /* Syslog */
+               syslog( Level, "%s", msg );
        }
+#endif
 
        if( Level <= LOG_CRIT )
        {
@@ -187,11 +200,6 @@ va_dcl
                fflush( stderr );
        }
 
-#ifdef USE_SYSLOG
-       /* Syslog */
-       syslog( Level, msg );
-#endif
-
        if( snotice )
        {
                /* NOTICE an lokale User mit "s"-Mode */
@@ -203,8 +211,8 @@ va_dcl
 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_Init_Resolver */
 
@@ -212,7 +220,7 @@ Log_Init_Resolver( VOID )
 GLOBAL VOID
 Log_Exit_Resolver( VOID )
 {
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
        closelog( );
 #endif
 } /* Log_Exit_Resolver */
@@ -231,7 +239,7 @@ va_dcl
 {
        /* Eintrag des Resolver in Logfile(s) schreiben */
 
-#ifndef USE_SYSLOG
+#ifndef SYSLOG
        return;
 #else
 
@@ -240,6 +248,8 @@ va_dcl
 
        assert( Format != NULL );
 
+       if( NGIRCd_NoDaemon ) return;
+
 #ifdef DEBUG
        if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
 #else
@@ -274,7 +284,7 @@ Wall_ServerNotice( CHAR *Msg )
        c = Client_First( );
        while( c )
        {
-               if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s", Client_ThisServer( ), Msg );
+               if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg );
                c = Client_Next( c );
        }
 } /* Wall_ServerNotice */