/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 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
#include "portab.h"
-static char UNUSED id[] = "$Id: log.c,v 1.56 2005/06/24 19:20:56 fw Exp $";
-
#include "imp.h"
#include <assert.h>
#include <errno.h>
#include "log.h"
-LOCAL char Init_Txt[127];
+static char Init_Txt[127];
+static bool Is_Daemon;
#ifdef DEBUG
-LOCAL char Error_File[FNAME_LEN];
+static char Error_File[FNAME_LEN];
#endif
-LOCAL Is_Daemon;
-LOCAL void Wall_ServerNotice PARAMS(( char *Msg ));
-GLOBAL void Log_SetDaemonized(void) { Is_Daemon = true; }
+static void Wall_ServerNotice PARAMS(( char *Msg ));
+
+static void
+Log_Message(int Level, const char *msg)
+{
+ if (!Is_Daemon) {
+ /* log to console */
+ fprintf(stdout, "[%ld:%d %4ld] %s\n", (long)getpid(), Level,
+ (long)time(NULL) - NGIRCd_Start, msg);
+ fflush(stdout);
+ }
+#ifdef SYSLOG
+ else {
+ syslog(Level, "%s", msg);
+ }
+#endif
+}
+
GLOBAL void
-Log_Init( void )
+Log_Init( bool Daemon_Mode )
{
+ Is_Daemon = Daemon_Mode;
+
#ifdef SYSLOG
-#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
+#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
#define LOG_CONS 0
#endif
#ifndef LOG_LOCAL5
} /* Log_Exit */
+/**
+ * Log function for debug messages.
+ * This function is only functional when the program is compiled with debug
+ * code enabled; otherwise it is an empty function which the compiler will
+ * hopefully mangle down to "nothing" (see log.h). Therefore you should use
+ * LogDebug(...) in favor to Log(LOG_DEBUG, ...).
+ * @param Format Format string like printf().
+ * @param ... Further arguments.
+ */
+#ifdef DEBUG
+# ifdef PROTOTYPES
+GLOBAL void
+LogDebug( const char *Format, ... )
+# else
+GLOBAL void
+LogDebug( Format, va_alist )
+const char *Format;
+va_dcl
+# endif /* PROTOTYPES */
+{
+ char msg[MAX_LOG_MSG_LEN];
+ va_list ap;
+
+ if (!NGIRCd_Debug) return;
+#ifdef PROTOTYPES
+ va_start( ap, Format );
+#else
+ va_start( ap );
+#endif
+ vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
+ va_end( ap );
+ Log(LOG_DEBUG, "%s", msg);
+}
+#endif /* DEBUG */
+
+
+/**
+ * Logging function of ngIRCd.
+ * This function logs messages to the console and/or syslog, whichever is
+ * suitable for the mode ngIRCd is running in (daemon vs. non-daemon).
+ * If LOG_snotice is set, the log messages goes to all user with the mode +s
+ * set and the local &SERVER channel, too.
+ * Please note: you sould use LogDebug(...) for debug messages!
+ * @param Level syslog level (LOG_xxx)
+ * @param Format Format string like printf().
+ * @param ... Further arguments.
+ */
#ifdef PROTOTYPES
GLOBAL void
Log( int Level, const char *Format, ... )
va_dcl
#endif
{
- /* Eintrag in Logfile(s) schreiben */
-
char msg[MAX_LOG_MSG_LEN];
bool snotice;
va_list ap;
if( Level == LOG_DEBUG ) return;
#endif
- /* String mit variablen Argumenten zusammenbauen ... */
#ifdef PROTOTYPES
va_start( ap, Format );
#else
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
- if( ! Is_Daemon )
- {
- /* auf Konsole ausgeben */
- fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
- fflush( stdout );
- }
-#ifdef SYSLOG
- else
- {
- /* Syslog */
- syslog( Level, "%s", msg );
- }
-#endif
+ Log_Message(Level, msg);
- if( Level <= LOG_CRIT )
- {
+ if (Level <= LOG_CRIT) {
/* log critical messages to stderr */
- fprintf( stderr, "%s\n", msg );
- fflush( stderr );
+ fprintf(stderr, "%s\n", msg);
+ fflush(stderr);
}
- if( snotice )
- {
- /* NOTICE an lokale User mit "s"-Mode */
- Wall_ServerNotice( msg );
+ if (snotice) {
+ /* Send NOTICE to all local users with mode +s and to the
+ * local &SERVER channel */
+ Wall_ServerNotice(msg);
+ Channel_LogServer(msg);
}
} /* Log */
openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif
#ifdef DEBUG
- Log_Resolver( LOG_DEBUG, "Resolver sub-process starting, PID %d.", getpid( ));
+ Log_Resolver(LOG_DEBUG, "Resolver sub-process starting, PID %ld.", (long)getpid());
#endif
} /* Log_Init_Resolver */
Log_Exit_Resolver( void )
{
#ifdef DEBUG
- Log_Resolver( LOG_DEBUG, "Resolver sub-process %d done.", getpid( ));
+ Log_Resolver(LOG_DEBUG, "Resolver sub-process %ld done.", (long)getpid());
#endif
#ifdef SYSLOG
closelog( );
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
- if( ! Is_Daemon )
- {
- /* Output to console */
- fprintf( stdout, "[%d:%d] %s\n", (int)getpid( ), Level, msg );
- fflush( stdout );
- }
-#ifdef SYSLOG
- else syslog( Level, "%s", msg );
-#endif
+ Log_Message(Level, msg);
} /* Log_Resolver */
-LOCAL void
+/**
+ * Send log messages to users flagged with the "s" mode.
+ * @param Msg The message to send.
+ */
+static void
Wall_ServerNotice( char *Msg )
{
- /* Server-Notice an entsprechende User verschicken */
-
CLIENT *c;
assert( Msg != NULL );
c = Client_First( );
- while( c )
- {
- if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg );
+ while(c) {
+ if (Client_Conn(c) > NONE && Client_HasMode(c, 's'))
+ IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c),
+ NOTICE_TXTPREFIX, Msg);
+
c = Client_Next( c );
}
} /* Wall_ServerNotice */
projects / ngircd-alex.git / blobdiff