* ngIRCd -- The Next Generation IRC Daemon
* 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 ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
*
- * $Id: log.c,v 1.32 2002/03/31 16:46:15 alex Exp $
- *
- * log.c: Logging-Funktionen
+ * Logging functions
*/
#include "portab.h"
+static char UNUSED id[] = "$Id: log.c,v 1.45 2004/05/07 11:19:21 alex Exp $";
+
#include "imp.h"
#include <assert.h>
#include <errno.h>
#include <sys/types.h>
#include <unistd.h>
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
#include <syslog.h>
#endif
#include "ngircd.h"
-#include "client.h"
#include "defines.h"
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
#include "irc-write.h"
#include "exp.h"
LOCAL CHAR Init_Txt[127];
-LOCAL VOID Wall_ServerNotice( CHAR *Msg );
+LOCAL VOID Wall_ServerNotice PARAMS(( CHAR *Msg ));
-GLOBAL VOID Log_Init( VOID )
+GLOBAL VOID
+Log_Init( VOID )
{
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
/* Syslog initialisieren */
- openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+ openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif
/* Hello World! */
}
#endif
if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
+
+ Error_File[0] = '\0';
} /* Log_Init */
-GLOBAL VOID Log_InitErrorfile( VOID )
+GLOBAL VOID
+Log_InitErrorfile( VOID )
{
/* "Error-Log" initialisieren: stderr in Datei umlenken. Dort
* landen z.B. alle Ausgaben von assert()-Aufrufen. */
/* Dateiname zusammen bauen */
- sprintf( Error_File, ERROR_DIR"/"PACKAGE"-%ld.err", (INT32)getpid( ));
+ sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (LONG)getpid( ));
/* stderr umlenken */
fflush( stderr );
} /* Log_InitErrfile */
-GLOBAL VOID Log_Exit( VOID )
+GLOBAL VOID
+Log_Exit( VOID )
{
/* Good Bye! */
- Log( LOG_NOTICE, PACKAGE" done.");
+ if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
+ else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
- /* Error-File (stderr) loeschen */
- if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
+ if( Error_File[0] )
+ {
+ /* Error-File (stderr) loeschen */
+ if( unlink( Error_File ) != 0 ) Log( LOG_ERR, "Can't delete \"%s\": %s", Error_File, strerror( errno ));
+ }
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
/* syslog abmelden */
closelog( );
#endif
} /* Log_Exit */
-GLOBAL VOID Log( INT Level, CONST CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL VOID
+Log( INT Level, CONST CHAR *Format, ... )
+#else
+GLOBAL VOID
+Log( Level, Format, va_alist )
+INT Level;
+CONST CHAR *Format;
+va_dcl
+#endif
{
/* Eintrag in Logfile(s) schreiben */
#endif
/* String mit variablen Argumenten zusammenbauen ... */
+#ifdef PROTOTYPES
va_start( ap, Format );
+#else
+ va_start( ap );
+#endif
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
if( NGIRCd_NoDaemon )
{
/* auf Konsole ausgeben */
- printf( "[%d] %s\n", Level, msg );
+ fprintf( stdout, "[%d] %s\n", Level, msg );
+ fflush( stdout );
}
+#ifdef SYSLOG
+ else
+ {
+ /* Syslog */
+ syslog( Level, "%s", msg );
+ }
+#endif
if( Level <= LOG_CRIT )
{
fflush( stderr );
}
-#ifdef USE_SYSLOG
- /* Syslog */
- syslog( Level, msg );
-#endif
-
if( snotice )
{
/* NOTICE an lokale User mit "s"-Mode */
} /* Log */
-GLOBAL VOID Log_Init_Resolver( VOID )
+GLOBAL VOID
+Log_Init_Resolver( VOID )
{
-#ifdef USE_SYSLOG
- openlog( PACKAGE, LOG_CONS|LOG_PID, LOG_LOCAL5 );
+#ifdef SYSLOG
+ openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
#endif
} /* Log_Init_Resolver */
-GLOBAL VOID Log_Exit_Resolver( VOID )
+GLOBAL VOID
+Log_Exit_Resolver( VOID )
{
-#ifdef USE_SYSLOG
+#ifdef SYSLOG
closelog( );
#endif
} /* Log_Exit_Resolver */
-GLOBAL VOID Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+#ifdef PROTOTYPES
+GLOBAL VOID
+Log_Resolver( CONST INT Level, CONST CHAR *Format, ... )
+#else
+GLOBAL VOID
+Log_Resolver( Level, Format, va_alist )
+CONST INT Level;
+CONST CHAR *Format;
+va_dcl
+#endif
{
/* Eintrag des Resolver in Logfile(s) schreiben */
-#ifndef USE_SYSLOG
+#ifndef SYSLOG
return;
#else
assert( Format != NULL );
+ if( NGIRCd_NoDaemon ) return;
+
#ifdef DEBUG
if(( Level == LOG_DEBUG ) && ( ! NGIRCd_Debug )) return;
#else
#endif
/* String mit variablen Argumenten zusammenbauen ... */
+#ifdef PROTOTYPES
va_start( ap, Format );
+#else
+ va_start( ap );
+#endif
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
} /* Log_Resolver */
-LOCAL VOID Wall_ServerNotice( CHAR *Msg )
+LOCAL VOID
+Wall_ServerNotice( CHAR *Msg )
{
/* Server-Notice an entsprechende User verschicken */
c = Client_First( );
while( c )
{
- if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s", Client_ThisServer( ), Msg );
+ if(( Client_Conn( c ) > NONE ) && ( Client_HasMode( c, 's' ))) IRC_WriteStrClient( c, "NOTICE %s :%s%s", Client_ThisServer( ), NOTICE_TXTPREFIX, Msg );
c = Client_Next( c );
}
} /* Wall_ServerNotice */
projects / ngircd-alex.git / blobdiff