mirror of
https://github.com/osmarks/ngircd.git
synced 2024-12-12 09:50:29 +00:00
Slightly reoder startup steps, and enhance logging
- Show name of configuration file at the beginning of start up. - Add a message when ngIRCd is ready, including its host name. - Show name of configuration file on REHASH (SIGHUP), too. - Change level of "done message" to NOTICE, like "starting" & "ready". - Initialize IO functions before channels, connections, clients, ...
This commit is contained in:
parent
ad8c4b8efb
commit
bb1d014aba
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* ngIRCd -- The Next Generation IRC Daemon
|
* ngIRCd -- The Next Generation IRC Daemon
|
||||||
* Copyright (c)2001-2018 Alexander Barton (alex@barton.de) and Contributors.
|
* Copyright (c)2001-2019 Alexander Barton (alex@barton.de) and Contributors.
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -902,6 +902,8 @@ Read_Config(bool TestOnly, bool IsStarting)
|
|||||||
FILE *fd;
|
FILE *fd;
|
||||||
DIR *dh;
|
DIR *dh;
|
||||||
|
|
||||||
|
Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile);
|
||||||
|
|
||||||
/* Open configuration file */
|
/* Open configuration file */
|
||||||
fd = fopen( NGIRCd_ConfFile, "r" );
|
fd = fopen( NGIRCd_ConfFile, "r" );
|
||||||
if( ! fd ) {
|
if( ! fd ) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* ngIRCd -- The Next Generation IRC Daemon
|
* ngIRCd -- The Next Generation IRC Daemon
|
||||||
* Copyright (c)2001-2018 Alexander Barton (alex@barton.de) and Contributors.
|
* Copyright (c)2001-2019 Alexander Barton (alex@barton.de) and Contributors.
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -660,6 +660,9 @@ Conn_Handler(void)
|
|||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
time_t t;
|
time_t t;
|
||||||
|
|
||||||
|
Log(LOG_NOTICE, "Server \"%s\" (on \"%s\") ready.",
|
||||||
|
Client_ID(Client_ThisServer()), Client_Hostname(Client_ThisServer()));
|
||||||
|
|
||||||
while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
|
while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
|
||||||
t = time(NULL);
|
t = time(NULL);
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* ngIRCd -- The Next Generation IRC Daemon
|
* ngIRCd -- The Next Generation IRC Daemon
|
||||||
* Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
|
* Copyright (c)2001-2019 Alexander Barton (alex@barton.de) and Contributors.
|
||||||
*
|
*
|
||||||
* 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
|
||||||
@ -80,6 +80,7 @@ Log_Init(bool Daemon_Mode)
|
|||||||
openlog(PACKAGE, LOG_CONS|LOG_PID, 0);
|
openlog(PACKAGE, LOG_CONS|LOG_PID, 0);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
Log(LOG_NOTICE, "%s starting ...", NGIRCd_Version);
|
||||||
} /* Log_Init */
|
} /* Log_Init */
|
||||||
|
|
||||||
|
|
||||||
@ -96,15 +97,13 @@ Log_ReInit(void)
|
|||||||
closelog();
|
closelog();
|
||||||
openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
|
openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
|
||||||
#endif
|
#endif
|
||||||
Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
|
|
||||||
Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
GLOBAL void
|
GLOBAL void
|
||||||
Log_Exit( void )
|
Log_Exit( void )
|
||||||
{
|
{
|
||||||
Log(LOG_INFO, "%s done%s, served %lu connection%s.", PACKAGE_NAME,
|
Log(LOG_NOTICE, "%s done%s, served %lu connection%s.", PACKAGE_NAME,
|
||||||
NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(),
|
NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(),
|
||||||
Conn_CountAccepted() == 1 ? "" : "s");
|
Conn_CountAccepted() == 1 ? "" : "s");
|
||||||
#ifdef SYSLOG
|
#ifdef SYSLOG
|
||||||
|
@ -246,26 +246,18 @@ main(int argc, const char *argv[])
|
|||||||
NGIRCd_SignalRestart = false;
|
NGIRCd_SignalRestart = false;
|
||||||
NGIRCd_SignalQuit = false;
|
NGIRCd_SignalQuit = false;
|
||||||
|
|
||||||
/* Initialize modules, part I */
|
|
||||||
Log_Init(!NGIRCd_NoDaemon);
|
Log_Init(!NGIRCd_NoDaemon);
|
||||||
Random_Init();
|
Random_Init();
|
||||||
Conf_Init();
|
Conf_Init();
|
||||||
Log_ReInit();
|
Log_ReInit();
|
||||||
|
|
||||||
/* Initialize the "main program": chroot environment, user and
|
/* Initialize the "main program":
|
||||||
* group ID, ... */
|
* chroot environment, user and group ID, ... */
|
||||||
if (!NGIRCd_Init(NGIRCd_NoDaemon)) {
|
if (!NGIRCd_Init(NGIRCd_NoDaemon)) {
|
||||||
Log(LOG_ALERT, "Fatal: Initialization failed, exiting!");
|
Log(LOG_ALERT, "Fatal: Initialization failed, exiting!");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize modules, part II: these functions are eventually
|
|
||||||
* called with already dropped privileges ... */
|
|
||||||
Channel_Init();
|
|
||||||
Client_Init();
|
|
||||||
Conn_Init();
|
|
||||||
Class_Init();
|
|
||||||
|
|
||||||
if (!io_library_init(CONNECTION_POOL)) {
|
if (!io_library_init(CONNECTION_POOL)) {
|
||||||
Log(LOG_ALERT,
|
Log(LOG_ALERT,
|
||||||
"Fatal: Could not initialize IO routines: %s",
|
"Fatal: Could not initialize IO routines: %s",
|
||||||
@ -280,6 +272,11 @@ main(int argc, const char *argv[])
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Channel_Init();
|
||||||
|
Conn_Init();
|
||||||
|
Class_Init();
|
||||||
|
Client_Init();
|
||||||
|
|
||||||
/* Create protocol and server identification. The syntax
|
/* Create protocol and server identification. The syntax
|
||||||
* used by ngIRCd in PASS commands and the known "extended
|
* used by ngIRCd in PASS commands and the known "extended
|
||||||
* flags" are described in doc/Protocol.txt. */
|
* flags" are described in doc/Protocol.txt. */
|
||||||
|
Loading…
Reference in New Issue
Block a user