From f951460ae991e2e8defb9638f8ee508283705cbb Mon Sep 17 00:00:00 2001 From: Quora Dodrill Date: Wed, 14 Aug 2013 14:28:11 -0700 Subject: [PATCH] src/s_conf: Moved error notification to proper place Previously it was in src/ircd.c, but accroding to jilles, this is a better place for the notification. This changes a patch made in adef4da10c65696fb9b79ffa797615770fd53abf and amended in 65d921173c6e3aa4f30dd78561d3a6f5d5f4cf31 and f6f049070e240d0ce637e9e3ac4fba4148b9725d. --- src/ircd.c | 7 ------- src/s_conf.c | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/ircd.c b/src/ircd.c index 84e62dff5..c739ebe91 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -619,13 +619,6 @@ main(int argc, char *argv[]) inotice("starting %s ...", ircd_version); inotice("%s", rb_lib_version()); } - - /* Make sure config file exists -- Quora */ - if( access( ConfigFileEntry.configfile, F_OK|R_OK ) == -1 ) { - inotice("FATAL: No config file found at %s, exiting", - ConfigFileEntry.configfile); - exit(-1); - } /* Init the event subsystem */ rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE); diff --git a/src/s_conf.c b/src/s_conf.c index 303ed5093..15e7006a1 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -1358,6 +1358,7 @@ read_conf_files(int cold) if(cold) { ilog(L_MAIN, "Failed in reading configuration file %s", filename); + inotice("Failed in reading configuration file %s, aborting", filename); exit(-1); } else