- Logging bei Timeout von Verbindungen geaendert.

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 9d651eae0a4ea94f8060b24c71e928941a09c377..d0608cbc248cf10745abecedbf5af2173c1546ce 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001 by Alexander Barton (alex@barton.de)
+ * 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
@@ -9,11 +9,23 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: log.c,v 1.14 2002/01/01 18:01:43 alex Exp $
+ * $Id: log.c,v 1.18 2002/02/19 20:07:13 alex Exp $
  *
  * log.c: Logging-Funktionen
  *
  * $Log: log.c,v $
+ * Revision 1.18  2002/02/19 20:07:13  alex
+ * - direkt nach dem Start werden die aktiven "Modes" ins Log geschrieben.
+ *
+ * Revision 1.17  2002/01/11 14:45:37  alex
+ * - Anpassungen an neue Kommandozeilen-Optionen "--debug" und "--nodaemon".
+ *
+ * Revision 1.16  2002/01/05 15:54:40  alex
+ * - syslog() etc. wurde verwendet, auch wenn USE_SYSLOG nicht definiert war.
+ *
+ * Revision 1.15  2002/01/02 02:42:58  alex
+ * - Copyright-Texte aktualisiert.
+ *
  * Revision 1.14  2002/01/01 18:01:43  alex
  * - Architektur und Betriebssystem in Start-Meldung aufgenommen.
  *
@@ -76,48 +88,62 @@
 #include <syslog.h>
 #endif
 
+#include "global.h"
+#include "ngircd.h"
+
 #include <exp.h>
 #include "log.h"
 
 
 GLOBAL VOID Log_Init( VOID )
 {
-       CHAR txt[64];
-
-       strcpy( txt, "" );
+       CHAR txt[127];
 
 #ifdef USE_SYSLOG
-       if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
-       strcat( txt, "SYSLOG" );
-#endif
-#ifdef STRICT_RFC
-       if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
-       strcat( txt, "RFC" );
+       /* Syslog initialisieren */
+       openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
+
+       /* Hello World! */
+       Log( LOG_NOTICE, "%s started.", NGIRCd_Version( ));
+
+       /* Informationen uebern den "Operation Mode" */
+       strcpy( txt, "" );
 #ifdef DEBUG
-       if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
-       strcat( txt, "DEBUG" );
+       if( NGIRCd_Debug )
+       {
+               if( txt[0] ) strcat( txt, ", " );
+               strcat( txt, "debug-mode" );
+       }
 #endif
+       if( NGIRCd_NoDaemon )
+       {
+               if( txt[0] ) strcat( txt, ", " );
+               strcat( txt, "no-daemon-mode" );
+       }
+       if( NGIRCd_Passive )
+       {
+               if( txt[0] ) strcat( txt, ", " );
+               strcat( txt, "passive-mode" );
+       }
 #ifdef SNIFFER
-       if( txt[0] ) strcat( txt, "+" );
-       else strcat( txt, "-" );
-       strcat( txt, "SNIFFER" );
+       if( NGIRCd_Sniffer )
+       {
+               if( txt[0] ) strcat( txt, ", " );
+               strcat( txt, "network sniffer" );
+       }
 #endif
-
-#ifdef USE_SYSLOG
-       openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
-#endif
-       Log( LOG_NOTICE, PACKAGE" version "VERSION"%s-"P_OSNAME"/"P_ARCHNAME" started.", txt );
+       if( txt[0] ) Log( LOG_INFO, "Activating: %s.", txt );
 } /* Log_Init */
 
 
 GLOBAL VOID Log_Exit( VOID )
 {
+       /* Good Bye! */
        Log( LOG_NOTICE, PACKAGE" done.");
+       
 #ifdef USE_SYSLOG
+       /* syslog abmelden */
        closelog( );
 #endif
 } /* Log_Exit */
@@ -132,7 +158,9 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
 
        assert( Format != NULL );
 
-#ifndef DEBUG
+#ifdef DEBUG
+       if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
+#else
        if( Level == LOG_DEBUG ) return;
 #endif
 
@@ -142,7 +170,7 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
        msg[MAX_LOG_MSG_LEN - 1] = '\0';
 
        /* ... und ausgeben */
-       printf( "[%d] %s\n", Level, msg );
+       if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg );
 #ifdef USE_SYSLOG
        syslog( Level, msg );
 #endif
@@ -171,16 +199,18 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
 {
        /* Eintrag des Resolver in Logfile(s) schreiben */
 
+#ifndef USE_SYSLOG
+       return;
+#else
+
        CHAR msg[MAX_LOG_MSG_LEN];
        va_list ap;
 
        assert( Format != NULL );
 
-#ifndef USE_SYSLOG
-       return;
-#endif
-
-#ifndef DEBUG
+#ifdef DEBUG
+       if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
+#else
        if( Level == LOG_DEBUG ) return;
 #endif
 
@@ -193,6 +223,7 @@ GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
        syslog( Level, msg );
 
        va_end( ap );
+#endif
 } /* Log_Resolver */