Add a counter for errored files

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 2852dc727c71899413f033c7544dde04b0e23d73..e9301d70abefe27aab40af865d47fde8d1aacd17 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1208,6 +1208,9 @@ void ServerConfig::Read(bool bail, User* user, int pass)
        {
                for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
                {
+                       if (bail)
+                               printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n", adding->c_str());
+
                        if (ServerInstance->Modules->Load(adding->c_str()))
                        {
                                ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
@@ -1220,14 +1223,17 @@ void ServerConfig::Read(bool bail, User* user, int pass)
                        {
                                if (user)
                                        user->WriteServ("974 %s %s :%s",user->nick, adding->c_str(), ServerInstance->Modules->LastError().c_str());
+
+                               if (bail)
+                               {
+                                       printf_c("\n[\033[1;31m*\033[0m] %s\n\n", ServerInstance->Modules->LastError().c_str());
+                                       ServerInstance->Exit(EXIT_STATUS_MODULE);
+                               }
                        }
                }
        }
 
-       ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules in pass 2.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
-
-       /** Note: This is safe, the method checks for user == NULL */
-       /*ServerInstance->Parser->SetupCommandTable(user);*/
+       ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
 
        if (user)
                user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
@@ -1237,33 +1243,46 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 
 bool ServerConfig::Downloading()
 {
+       if (isatty(0) && isatty(1) && isatty(2))
+       {
+               printf(".");
+               fflush(stdout);
+       }
+
        /* Returns true if there are still files in the process of downloading */
-       return (TotalDownloaded >= IncludedFiles.size());
+       return (TotalDownloaded < IncludedFiles.size());
 }
 
 void ServerConfig::StartDownloads()
 {
+       if (isatty(0) && isatty(1) && isatty(2))
+               printf("Downloading configuration ");
+
        TotalDownloaded = 0;
+       FileErrors = 0;
+
        /* Reads all local files into the IncludedFiles map, then initiates sockets for the remote ones */
        for (std::map<std::string, std::istream*>::iterator x = IncludedFiles.begin(); x != IncludedFiles.end(); ++x)
        {
-               ServerInstance->Log(DEBUG,"Begin download for %s", x->first.c_str());
-               if ((x->first[0] == '/') || (x->first.substr(7) == "file://"))
+               std::string file = x->first;
+               ServerInstance->Log(DEBUG,"Begin download for %s", file.c_str());
+               if ((file[0] == '/') || (file.substr(0, 7) == "file://"))
                {
+                       ServerInstance->Log(DEBUG,"Core-handled schema for %s %s", file.c_str(), file.substr(0,7).c_str());
                        /* For file:// schema files, we use std::ifstream which is a derivative of std::istream.
                         * For all other file schemas, we use a std::stringstream.
                         */
 
-                       /* First, delete the dummy std::stringstream file that LoadConf put here */
-                       delete x->second;
-
-                       /* Now add our own ifstream */
-                       std::ifstream* conf = new std::ifstream(x->first.c_str());
+                       /* Add our own ifstream */
+                       std::ifstream* conf = new std::ifstream(file.c_str());
                        if (!conf->fail())
                        {
-                               ServerInstance->Log(DEBUG,"file:// schema file %s loaded OK", x->first.c_str());
+                               ServerInstance->Log(DEBUG,"file:// schema file %s loaded OK", file.c_str());
+                               delete x->second;
                                x->second = conf;
                        }
+                       else
+                               FileErrors++;
 
                        TotalDownloaded++;
                }
@@ -1631,7 +1650,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
        std::replace(newfile.begin(),newfile.end(),'\\','/');
        std::replace(confpath.begin(),confpath.end(),'\\','/');
 
-       if (newfile[0] != '/')
+       if ((newfile[0] != '/') && (newfile.find("://") == std::string::npos))
        {
                if((pos = confpath.rfind("/")) != std::string::npos)
                {