mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-11-01 06:23:00 +00:00
Code Issues Releases Wiki Activity

Slightly reoder startup steps, and enhance logging

Browse Source 
- 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:
Alexander Barton
2019-06-29 15:57:44 +02:00
parent ad8c4b8efb
commit bb1d014aba
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ngircd/conf.c
View File

@@ -1,6 +1,6 @@
/*
* 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
* 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;
DIR *dh;
Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile);
/* Open configuration file */
fd = fopen( NGIRCd_ConfFile, "r" );
if( ! fd ) {

5
src/ngircd/conn.c
View File

@@ -1,6 +1,6 @@
/*
* 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
* it under the terms of the GNU General Public License as published by
@@ -660,6 +660,9 @@ Conn_Handler(void)
struct timeval tv;
time_t t;
Log(LOG_NOTICE, "Server \"%s\" (on \"%s\") ready.",
Client_ID(Client_ThisServer()), Client_Hostname(Client_ThisServer()));
while (!NGIRCd_SignalQuit && !NGIRCd_SignalRestart) {
t = time(NULL);

7
src/ngircd/log.c
View File

@@ -1,6 +1,6 @@
/*
* 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
* 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);
#endif
#endif
Log(LOG_NOTICE, "%s starting ...", NGIRCd_Version);
} /* Log_Init */
@@ -96,15 +97,13 @@ Log_ReInit(void)
closelog();
openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility);
#endif
Log(LOG_NOTICE, "%s started.", NGIRCd_Version);
Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile);
}
GLOBAL 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(),
Conn_CountAccepted() == 1 ? "" : "s");
#ifdef SYSLOG

17
src/ngircd/ngircd.c
View File

@@ -246,26 +246,18 @@ main(int argc, const char *argv[])
NGIRCd_SignalRestart = false;
NGIRCd_SignalQuit = false;
/* Initialize modules, part I */
Log_Init(!NGIRCd_NoDaemon);
Random_Init();
Conf_Init();
Log_ReInit();
/* Initialize the "main program": chroot environment, user and
* group ID, ... */
/* Initialize the "main program":
* chroot environment, user and group ID, ... */
if (!NGIRCd_Init(NGIRCd_NoDaemon)) {
Log(LOG_ALERT, "Fatal: Initialization failed, exiting!");
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)) {
Log(LOG_ALERT,
"Fatal: Could not initialize IO routines: %s",
@@ -280,6 +272,11 @@ main(int argc, const char *argv[])
exit(1);
}
Channel_Init();
Conn_Init();
Class_Init();
Client_Init();
/* Create protocol and server identification. The syntax
* used by ngIRCd in PASS commands and the known "extended
* flags" are described in doc/Protocol.txt. */