This works with multiple remote includes now except it hangs when an include is withi...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 8f32e94acc541054fd1b19fb1713c64fcd6daa70..6fecc1f507d8cd8f16a577271a840fb25b74705e 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -106,6 +106,8 @@ std::string Event::GetEventID()
 
                Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
                Module::~Module() { }
+void           Module::OnReadConfig(ServerConfig*, ConfigReader*) { }
+int            Module::OnDownloadFile(const std::string&, std::istream*&) { return 0; }
 void           Module::OnUserConnect(User*) { }
 void           Module::OnUserQuit(User*, const std::string&, const std::string&) { }
 void           Module::OnUserDisconnect(User*) { }
@@ -555,8 +557,6 @@ void ModuleManager::LoadAll()
                        Instance->Exit(EXIT_STATUS_MODULE);
                }
        }
-       printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", (this->GetCount()), (this->GetCount()) == 1 ? " has" : "s have");
-       Instance->Log(DEFAULT,"Total loaded modules: %d", this->GetCount());
 }
 
 bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
@@ -825,7 +825,11 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
        this->data = new ConfigDataHash;
        this->privatehash = true;
        this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-       this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog);
+       for (int pass = 0; pass < 2; pass++)
+       {
+               /*** XXX: Can return a 'not ready yet!' code! */
+               this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog, pass);
+       }
        if (!this->readerror)
                this->error = CONF_FILE_NOT_FOUND;
 }