X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flog.c;h=f81c308ff8cc5f401c06511a6aaa90a42e545fc4;hb=5462c6c50fd01fd516e29a42ee0b15c946c11d27;hp=5559a2c6ada62e176d1e39ac0f3fda7d6dc4cb09;hpb=d26a283ea9ae86c5c4633a46aaec69b02def7c66;p=ngircd-alex.git

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 5559a2c6..f81c308f 100644
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
  *
  * 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
@@ -34,7 +34,6 @@
 #include "ngircd.h"
 #include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 
@@ -50,8 +49,6 @@ static char Error_File[FNAME_LEN];
 #endif
 
 
-static void Wall_ServerNotice PARAMS(( char *Msg ));
-
 static void
 Log_Message(int Level, const char *msg)
 {
@@ -81,14 +78,12 @@ Log_Init( bool Daemon_Mode )
 #ifndef LOG_LOCAL5
 #define LOG_LOCAL5 0
 #endif
-	/* Syslog initialisieren */
 	openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
 
-	/* Hello World! */
 	Log( LOG_NOTICE, "%s started.", NGIRCd_Version );
 	  
-	/* Informationen uebern den "Operation Mode" */
+	/* Information about "Operation Mode" */
 	Init_Txt[0] = '\0';
 #ifdef DEBUG
 	if( NGIRCd_Debug )
@@ -122,17 +117,11 @@ Log_Init( bool Daemon_Mode )
 
 
 #ifdef DEBUG
-
 GLOBAL void
 Log_InitErrorfile( void )
 {
-	/* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
-	 * landen z.B. alle Ausgaben von assert()-Aufrufen. */
-
-	/* Dateiname zusammen bauen */
 	snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
 
-	/* stderr umlenken */
 	fflush( stderr );
 	if( ! freopen( Error_File, "w", stderr ))
 	{
@@ -140,17 +129,13 @@ Log_InitErrorfile( void )
 		return;
 	}
 
-	/* Einige Infos in das Error-File schreiben */
 	fputs( ctime( &NGIRCd_Start ), stderr );
 	fprintf( stderr, "%s started.\n", NGIRCd_Version );
 	fprintf( stderr, "Activating: %s\n\n", Init_Txt[0] ? Init_Txt : "-" );
 	fflush( stderr );
 
-#ifdef DEBUG
-	Log( LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File );
-#endif
+	Log(LOG_DEBUG, "Redirected stderr to \"%s\".", Error_File);
 } /* Log_InitErrfile */
-
 #endif
 
 
@@ -158,8 +143,8 @@ GLOBAL void
 Log_Exit( void )
 {
 	/* Good Bye! */
-	if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
-	else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
+	Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME,
+	    NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted());
 
 #ifdef DEBUG
 	if( Error_File[0] )
@@ -170,8 +155,7 @@ Log_Exit( void )
 #endif
 
 #ifdef SYSLOG
-	/* syslog abmelden */
-	closelog( );
+	closelog();
 #endif
 } /* Log_Exit */
 
@@ -273,7 +257,7 @@ va_dcl
 	if (snotice) {
 		/* Send NOTICE to all local users with mode +s and to the
 		 * local &SERVER channel */
-		Wall_ServerNotice(msg);
+		Log_ServerNotice('s', "%s", msg);
 		Channel_LogServer(msg);
 	}
 } /* Log */
@@ -341,25 +325,41 @@ va_dcl
 
 
 /**
- * Send log messages to users flagged with the "s" mode.
- * @param Msg The message to send.
+ * Send a log message to all local users flagged with the given user mode.
+ * @param UserMode User mode which the target user must have set,
+ * @param Format The format string.
  */
-static void
-Wall_ServerNotice( char *Msg )
+#ifdef PROTOTYPES
+GLOBAL void
+Log_ServerNotice(const char UserMode, const char *Format, ... )
+#else
+GLOBAL void
+Log_ServerNotice(UserMode, Format, va_alist)
+const char UserMode;
+const char *Format;
+va_dcl
+#endif
 {
 	CLIENT *c;
+	char msg[MAX_LOG_MSG_LEN];
+	va_list ap;
 
-	assert( Msg != NULL );
+	assert(Format != NULL);
 
-	c = Client_First( );
-	while(c) {
-		if (Client_Conn(c) > NONE && Client_HasMode(c, 's'))
-			IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c),
-							NOTICE_TXTPREFIX, Msg);
+#ifdef PROTOTYPES
+	va_start(ap, Format);
+#else
+	va_start(ap);
+#endif
+	vsnprintf(msg, MAX_LOG_MSG_LEN, Format, ap);
+	va_end(ap);
 
-		c = Client_Next( c );
+	for(c=Client_First(); c != NULL; c=Client_Next(c)) {
+		if (Client_Conn(c) > NONE && Client_HasMode(c, UserMode))
+			IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c),
+							NOTICE_TXTPREFIX, msg);
 	}
-} /* Wall_ServerNotice */
+} /* Log_ServerNotice */
 
 
 /* -eof- */