Merge branch 'isupport-charset' of github.com:grawity/charybdis

[solanum.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index ca93f05d6885c11b38d71a888cf5c3135bcbeeda..57c32fc44a0855935b25c7b0d6c371fd908f6cea 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -52,6 +52,8 @@
 #include "bandbi.h"
 #include "operhash.h"
 #include "chmode.h"
+#include "hook.h"
+#include "s_assert.h"
 
 struct config_server_hide ConfigServerHide;
 
@@ -1349,6 +1351,8 @@ read_conf_files(int cold)
           dont know anything else
 
           - Gozem 2002-07-21 
+
+
         */
        rb_strlcpy(conffilebuf, filename, sizeof(conffilebuf));
 
@@ -1356,7 +1360,15 @@ read_conf_files(int cold)
        {
                if(cold)
                {
+                       inotice("Failed in reading configuration file %s, aborting", filename);
                        ilog(L_MAIN, "Failed in reading configuration file %s", filename);
+
+                       int e;
+                       e = errno;
+
+                       inotice("FATAL: %s %s", strerror(e), filename);
+                       ilog(L_MAIN, "FATAL: %s %s", strerror(e), filename);
+
                        exit(-1);
                }
                else
@@ -1372,7 +1384,10 @@ read_conf_files(int cold)
                clear_out_old_conf();
        }
 
+       call_hook(h_conf_read_start, NULL);
        read_conf(conf_fbfile_in);
+       call_hook(h_conf_read_end, NULL);
+
        fclose(conf_fbfile_in);
 }