- If Conf_MaxConnections is "ulimited" (<1) it is limited to FD_SETSIZE.

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 1cf83c31c7e1925424edcaf1cdb2f0679da277f5..79f3c6fef7b9234506210fdb499b27e2b2dfd6a7 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.33 2002/05/27 13:09:27 alex Exp $
- *
- * log.c: Logging-Funktionen
+ * Logging functions
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: log.c,v 1.41 2002/12/12 12:24:18 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -96,7 +95,7 @@ Log_InitErrorfile( VOID )
         * landen z.B. alle Ausgaben von assert()-Aufrufen. */
 
        /* Dateiname zusammen bauen */
-       sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( ));
+       sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (LONG)getpid( ));
 
        /* stderr umlenken */
        fflush( stderr );
@@ -120,7 +119,8 @@ GLOBAL VOID
 Log_Exit( VOID )
 {
        /* Good Bye! */
-       Log( LOG_NOTICE, PACKAGE" done.");
+       if( NGIRCd_Restart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE );
+       else Log( LOG_NOTICE, "%s done.", PACKAGE );
 
        /* Error-File (stderr) loeschen */
        if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
@@ -132,8 +132,16 @@ Log_Exit( VOID )
 } /* Log_Exit */
 
 
+#ifdef PROTOTYPES
 GLOBAL VOID
 Log( INT Level, CONST CHAR *Format, ... )
+#else
+GLOBAL VOID
+Log( Level, Format, va_alist )
+INT Level;
+CONST CHAR *Format;
+va_dcl
+#endif
 {
        /* Eintrag in Logfile(s) schreiben */
 
@@ -158,15 +166,27 @@ Log( INT Level, CONST CHAR *Format, ... )
 #endif
 
        /* String mit variablen Argumenten zusammenbauen ... */
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
        if( NGIRCd_NoDaemon )
        {
                /* auf Konsole ausgeben */
-               printf( "[%d] %s\n", Level, msg );
+               fprintf( stdout, "[%d] %s\n", Level, msg );
+               fflush( stdout );
        }
+#ifdef USE_SYSLOG
+       else
+       {
+               /* Syslog */
+               syslog( Level, "%s", msg );
+       }
+#endif
 
        if( Level <= LOG_CRIT )
        {
@@ -175,11 +195,6 @@ Log( INT Level, CONST CHAR *Format, ... )
                fflush( stderr );
        }
 
-#ifdef USE_SYSLOG
-       /* Syslog */
-       syslog( Level, msg );
-#endif
-
        if( snotice )
        {
                /* NOTICE an lokale User mit "s"-Mode */
@@ -206,8 +221,16 @@ Log_Exit_Resolver( VOID )
 } /* Log_Exit_Resolver */
 
 
+#ifdef PROTOTYPES
 GLOBAL VOID
 Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+#else
+GLOBAL VOID
+Log_Resolver( Level, Format, va_alist )
+CONST INT Level;
+CONST CHAR *Format;
+va_dcl
+#endif
 {
        /* Eintrag des Resolver in Logfile(s) schreiben */
 
@@ -220,6 +243,8 @@ Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 
        assert( Format != NULL );
 
+       if( NGIRCd_NoDaemon ) return;
+
 #ifdef DEBUG
        if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
 #else
@@ -227,7 +252,11 @@ Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 #endif
 
        /* String mit variablen Argumenten zusammenbauen ... */
+#ifdef PROTOTYPES
        va_start( ap, Format );
+#else
+       va_start( ap );
+#endif
        vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
        va_end( ap );
 
@@ -250,7 +279,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 */