X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=b10f3c4fcd50a1f0e11477934523d8c2df300822;hp=10e25219b5f11fb0f4d7315b4d42f5355d5e26a4;hb=95a4b1b1587f33692830153d6d03081b5e51d172;hpb=3d1a09627bc8154c281e302d2b1e9e99c21a464d

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 10e25219..b10f3c4f 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -1,57 +1,111 @@
 /*
  * 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
  * 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 comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: log.c,v 1.3 2001/12/12 23:31:24 alex Exp $
+ * $Id: log.c,v 1.23 2002/03/25 19:11:01 alex Exp $
  *
  * log.c: Logging-Funktionen
- *
- * $Log: log.c,v $
- * Revision 1.3  2001/12/12 23:31:24  alex
- * - Zum Loggen wird nun auch syslog verwendet.
- *
- * Revision 1.2  2001/12/12 17:19:12  alex
- * - in Log-Meldungen wird nun auch der Level der Meldung ausgegeben.
- *
- * Revision 1.1.1.1  2001/12/11 21:53:04  alex
- * - Imported sources to CVS.
  */
 
 
 #define MAX_LOG_MSG_LEN 256
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#ifdef USE_SYSLOG
 #include <syslog.h>
+#endif
+
+#include "ngircd.h"
+#include "defines.h"
 
-#include <exp.h>
+#include "exp.h"
 #include "log.h"
 
 
 GLOBAL VOID Log_Init( VOID )
 {
-	openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_DAEMON );
-	Log( LOG_INFO, PACKAGE" version "VERSION" started.");
+	CHAR txt[127];
+
+#ifdef USE_SYSLOG
+	/* 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( 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( NGIRCd_Sniffer )
+	{
+		if( txt[0] ) strcat( txt, ", " );
+		strcat( txt, "network sniffer" );
+	}
+#endif
+	if( txt[0] ) Log( LOG_INFO, "Activating: %s.", txt );
+
+	/* stderr in Datei umlenken */
+	fflush( stderr );
+	if( ! freopen( ERROR_FILE, "a+", stderr )) Log( LOG_ERR, "Can't reopen stderr (\""ERROR_FILE"\"): %s", strerror( errno ));
+
+	fprintf( stderr, "\n--- %s ---\n\n", NGIRCd_StartStr );
+	fprintf( stderr, "%s started.\npid=%ld, ppid=%ld, uid=%ld, gid=%ld [euid=%ld, egid=%ld].\nActivating: %s\n\n", NGIRCd_Version( ), (INT32)getpid( ), (INT32)getppid( ), (INT32)getuid( ), (INT32)getgid( ), (INT32)geteuid( ), (INT32)getegid( ), txt[0] ? txt : "-" );
+	fflush( stderr );
 } /* Log_Init */
 
 
 GLOBAL VOID Log_Exit( VOID )
 {
-	Log( LOG_INFO, PACKAGE" done.");
+	time_t t;
+	
+	/* Good Bye! */
+	Log( LOG_NOTICE, PACKAGE" done.");
+
+	t = time( NULL );
+	fputs( ctime( &t ), stderr );
+	fprintf( stderr, PACKAGE" done (pid=%ld).\n", (INT32)getpid( ));
+	fflush( stderr );
+
+#ifdef USE_SYSLOG
+	/* syslog abmelden */
 	closelog( );
+#endif
 } /* Log_Exit */
 
 
@@ -61,20 +115,84 @@ GLOBAL VOID Log( CONST INT Level, CONST CHAR *Format, ... )
 
 	CHAR msg[MAX_LOG_MSG_LEN];
 	va_list ap;
+	time_t t;
 
 	assert( Format != NULL );
 
+#ifdef DEBUG
+	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
+#else
+	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] = '\0';
+	vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
+	va_end( ap );
+
+	/* In Error-File schreiben */
+	if( Level <= LOG_ERR )
+	{
+		t = time( NULL );
+		fputs( ctime( &t ), stderr );
+		fprintf( stderr, "[%d] %s\n\n", Level, msg );
+	}
 
 	/* ... und ausgeben */
-	printf( "[%d] %s\n", Level, msg );
+	if( NGIRCd_NoDaemon ) printf( "[%d] %s\n", Level, msg );
+
+#ifdef USE_SYSLOG
+	/* Syslog */
 	syslog( Level, msg );
+#endif
+} /* 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 */
+
+#ifndef USE_SYSLOG
+	return;
+#else
+
+	CHAR msg[MAX_LOG_MSG_LEN];
+	va_list ap;
+
+	assert( Format != NULL );
+
+#ifdef DEBUG
+	if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
+#else
+	if( Level == LOG_DEBUG ) return;
+#endif
+
+	/* String mit variablen Argumenten zusammenbauen ... */
+	va_start( ap, Format );
+	vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
 	va_end( ap );
-} /* Log */
+
+	/* ... und ausgeben */
+	syslog( Level, msg );
+
+#endif
+} /* Log_Resolver */
 
 
 /* -eof- */