* at this point
*/
+ if (!ServerInstance->Res)
+ ServerInstance->Res = new DNS(ServerInstance);
/** Note: This is safe, the method checks for user == NULL */
ServerInstance->Parser->SetupCommandTable(user);
ServerInstance->Modules->LoadAll();
{
for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
{
+ /* Skip over modules that are aleready loaded for some reason */
+ if (ServerInstance->Modules->Find(*adding))
+ continue;
+
+ 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());
{
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);
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 true;
+ return (TotalDownloaded < IncludedFiles.size());
+}
+
+void ServerConfig::Complete(const std::string &filename, bool error)
+{
+ std::map<std::string, std::istream*>::iterator x = IncludedFiles.find(filename);
+
+ if (x != IncludedFiles.end())
+ {
+ TotalDownloaded++;
+ if (error)
+ {
+ delete x->second;
+ x->second = NULL;
+ FileErrors++;
+ }
+ }
+
+ return;
}
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::stringstream*>::iterator x = IncludedFiles.begin(); x != IncludedFiles.end(); ++x)
+ 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());
+ 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", file.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.
+ */
+
+ /* 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", file.c_str());
+ delete x->second;
+ x->second = conf;
+ }
+ else
+ {
+ delete x->second;
+ x->second = NULL;
+ FileErrors++;
+ }
+
+ TotalDownloaded++;
+ }
+ else
+ {
+ /* Modules handle these */
+ ServerInstance->Log(DEBUG,"Module-handled schema for %s", x->first.c_str());
+
+ /* For now, error it */
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnDownloadFile, OnDownloadFile(file, x->second));
+ if (MOD_RESULT == 0)
+ {
+ /* No module claimed this file */
+ TotalDownloaded++;
+ FileErrors++;
+ delete x->second;
+ x->second = NULL;
+ }
+ }
}
}
bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass)
{
std::string line;
- std::stringstream* conf = NULL;
+ std::istream* conf = NULL;
char ch;
long linenumber;
bool in_tag;
in_quote = false;
in_comment = false;
- /* Check if the file open failed first */
- if (IncludedFiles.find(filename) == IncludedFiles.end())
+ if (std::string(filename) == CONFIG_FILE)
{
- if (pass == 0)
+ conf = new std::ifstream(filename);
+ if (conf->fail())
{
- ServerInstance->Log(DEBUG,"Push include file %s onto map", filename);
- /* First pass, we insert the file into a map, and just return true */
- IncludedFiles.insert(std::make_pair(filename,new std::stringstream));
- return true;
+ errorstream << "File " << filename << " could not be opened." << std::endl;
+ return false;
+ }
+ }
+ else
+ {
+ std::map<std::string, std::istream*>::iterator x = IncludedFiles.find(filename);
+ if (x == IncludedFiles.end())
+ {
+ if (pass == 0)
+ {
+ ServerInstance->Log(DEBUG,"Push include file %s onto map", filename);
+ /* First pass, we insert the file into a map, and just return true */
+ IncludedFiles.insert(std::make_pair(filename,new std::stringstream));
+ return true;
+ }
+ else
+ {
+ /* Second pass, look for the file in the map */
+ ServerInstance->Log(DEBUG,"We are in the second pass, and %s is not in the map!", filename);
+ errorstream << "File " << filename << " could not be opened." << std::endl;
+ return false;
+ }
}
else
{
- /* Second pass, look for the file in the map */
- ServerInstance->Log(DEBUG,"We are in the second pass, and %s is not in the map!", filename);
- errorstream << "File " << filename << " could not be found." << std::endl;
- return false;
+ if (x->second)
+ conf = IncludedFiles.find(filename)->second;
+ else
+ {
+ errorstream << "File " << filename << " could not be opened." << std::endl;
+ return false;
+ }
}
}
- else
- conf = IncludedFiles.find(filename)->second;
/* Start reading characters... */
while (conf->get(ch))
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)
{
projects / user / henk / code / inspircd.git / blobdiff