albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly re-open syslog logging after reading of configuration 

Syslog logging has been initialized before reading the configuraton
file, so ngIRCd always used the default facility and ignored the
"SyslogFacility" configuration option.

Thanks to Patrik Schindler for reporting this issue!
This commit is contained in:
Alexander Barton 2012-02-14 11:01:13 +01:00
parent 3f46e93ccc
commit 3641e51109
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ngircd/log.c
View File

@ -64,6 +64,12 @@ Log_Message(int Level, const char *msg)
} }
/**
* Initialitze logging.
* This function is called before the configuration file is read in.
*
* @param Daemon_Mode Set to true if ngIRCd is running as daemon.
*/
GLOBAL void GLOBAL void
Log_Init(bool Daemon_Mode) Log_Init(bool Daemon_Mode)
{ {
@ -80,6 +86,23 @@ Log_Init(bool Daemon_Mode)
} /* Log_Init */ } /* Log_Init */
/**
* Re-init logging after reading the configuration file.
*/
GLOBAL void
Log_ReInit(void)
{
#ifdef SYSLOG
#ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */
#define LOG_CONS 0
#endif
closelog();
openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility);
#endif
Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
}
GLOBAL void GLOBAL void
Log_Exit( void ) Log_Exit( void )
{ {

3
src/ngircd/log.h
View File

@ -1,6 +1,6 @@
/* /*
* ngIRCd -- The Next Generation IRC Daemon * ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001-2010 Alexander Barton (alex@barton.de) * Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -36,6 +36,7 @@ GLOBAL void Log_Init PARAMS(( bool Daemon_Mode ));
GLOBAL void Log_Exit PARAMS(( void )); GLOBAL void Log_Exit PARAMS(( void ));
GLOBAL void Log PARAMS(( int Level, const char *Format, ... )); GLOBAL void Log PARAMS(( int Level, const char *Format, ... ));
GLOBAL void Log_ReInit PARAMS((void));
GLOBAL void Log_ServerNotice PARAMS((char UserMode, const char *Format, ...)); GLOBAL void Log_ServerNotice PARAMS((char UserMode, const char *Format, ...));

4
src/ngircd/ngircd.c
View File

@ -255,11 +255,11 @@ main(int argc, const char *argv[])
NGIRCd_SignalRestart = false; NGIRCd_SignalRestart = false;
NGIRCd_SignalQuit = false; NGIRCd_SignalQuit = false;
Random_Init();
/* Initialize modules, part I */ /* Initialize modules, part I */
Log_Init(!NGIRCd_NoDaemon); Log_Init(!NGIRCd_NoDaemon);
Random_Init();
Conf_Init(); Conf_Init();
Log_ReInit();
/* Initialize the "main program": chroot environment, user and /* Initialize the "main program": chroot environment, user and
* group ID, ... */ * group ID, ... */