- Log-Funktionen fuer Resolver-Sub-Prozess implementiert.

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

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 7fb9ac150a7fca6322ad7dab4166a17f898b0805..c28023db1478c9833b96aafac8bd3c9f9f67fc72 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -9,11 +9,26 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: log.c,v 1.7 2001/12/25 22:04:26 alex Exp $
+ * $Id: log.c,v 1.12 2001/12/29 20:16:31 alex Exp $
  *
  * log.c: Logging-Funktionen
  *
  * $Log: log.c,v $
+ * Revision 1.12  2001/12/29 20:16:31  alex
+ * - Log-Funktionen fuer Resolver-Sub-Prozess implementiert.
+ *
+ * Revision 1.11  2001/12/29 03:08:49  alex
+ * - neue configure-Option "--enable-strict-rfc".
+ *
+ * Revision 1.10  2001/12/27 01:44:49  alex
+ * - die Verwendung von syslog kann nun abgeschaltet werden.
+ *
+ * Revision 1.9  2001/12/26 03:22:16  alex
+ * - string.h wird nun includiert.
+ *
+ * Revision 1.8  2001/12/25 23:13:00  alex
+ * - Versionsstring bei Programmstart verbessert.
+ *
  * Revision 1.7  2001/12/25 22:04:26  alex
  * - Aenderungen an den Debug- und Logging-Funktionen.
  *
@@ -47,7 +62,11 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
+
+#ifdef USE_SYSLOG
 #include <syslog.h>
+#endif
 
 #include <exp.h>
 #include "log.h"
@@ -55,15 +74,44 @@
 
 GLOBAL VOID Log_Init( VOID )
 {
+       CHAR txt[64];
+
+       strcpy( txt, "" );
+
+#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" );
+#endif
+#ifdef DEBUG
+       if( txt[0] ) strcat( txt, "+" );
+       else strcat( txt, "-" );
+       strcat( txt, "DEBUG" );
+#endif
+#ifdef SNIFFER
+       if( txt[0] ) strcat( txt, "+" );
+       else strcat( txt, "-" );
+       strcat( txt, "SNIFFER" );
+#endif
+
+#ifdef USE_SYSLOG
        openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
-       Log( LOG_NOTICE, PACKAGE" version "VERSION" started.");
+#endif
+       Log( LOG_NOTICE, PACKAGE" version "VERSION"%s started.", txt );
 } /* Log_Init */
 
 
 GLOBAL VOID Log_Exit( VOID )
 {
        Log( LOG_NOTICE, PACKAGE" done.");
+#ifdef USE_SYSLOG
        closelog( );
+#endif
 } /* Log_Exit */
 
 
@@ -74,12 +122,12 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
        CHAR msg[MAX_LOG_MSG_LEN];
        va_list ap;
 
+       assert( Format != NULL );
+
 #ifndef DEBUG
        if( Level == LOG_DEBUG ) return;
 #endif
 
-       assert( Format != NULL );
-
        /* String mit variablen Argumenten zusammenbauen ... */
        va_start( ap, Format );
        vsnprintf( msg, MAX_LOG_MSG_LEN - 1, Format, ap );
@@ -87,10 +135,57 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
 
        /* ... und ausgeben */
        printf( "[%d] %s\n", Level, msg );
+#ifdef USE_SYSLOG
        syslog( Level, msg );
+#endif
 
        va_end( ap );
 } /* Log */
 
 
+GLOBAL VOID Log_Init_Resolver( VOID )
+{
+#ifdef USE_SYSLOG
+       openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+#endif
+} /* Log_Init_Resolver */
+
+
+GLOBAL VOID Log_Exit_Resolver( VOID )
+{
+#ifdef USE_SYSLOG
+       closelog( );
+#endif
+} /* Log_Exit_Resolver */
+
+
+GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+{
+       /* Eintrag des Resolver in Logfile(s) schreiben */
+
+       CHAR msg[MAX_LOG_MSG_LEN];
+       va_list ap;
+
+       assert( Format != NULL );
+
+#ifndef USE_SYSLOG
+       return;
+#endif
+
+#ifndef DEBUG
+       if( Level == LOG_DEBUG ) return;
+#endif
+
+       /* String mit variablen Argumenten zusammenbauen ... */
+       va_start( ap, Format );
+       vsnprintf( msg, MAX_LOG_MSG_LEN - 1, Format, ap );
+       msg[MAX_LOG_MSG_LEN - 1] = '\0';
+
+       /* ... und ausgeben */
+       syslog( Level, msg );
+
+       va_end( ap );
+} /* Log_Resolver */
+
+
 /* -eof- */