bool ServerConfig::Downloading()
{
- ServerInstance->Log(DEBUG, "ServerConfig::Downloading() TotalDownloaded %u of %u", TotalDownloaded, IncludedFiles.size());
+ 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());
}
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", 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.
*/
- /* 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
+ {
+ delete x->second;
+ x->second = NULL;
+ FileErrors++;
+ }
TotalDownloaded++;
}
{
/* 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, reinterpret_cast<std::istringstream*>(x->second)));
+ if (MOD_RESULT == 0)
+ {
+ /* No module claimed this file */
+ TotalDownloaded++;
+ FileErrors++;
+ delete x->second;
+ x->second = NULL;
+ }
}
}
}
}
else
{
- /* Check if the file open failed first */
- if (IncludedFiles.find(filename) == IncludedFiles.end())
+ std::map<std::string, std::istream*>::iterator x = IncludedFiles.find(filename);
+ if (x == IncludedFiles.end())
{
if (pass == 0)
{
}
}
else
- conf = IncludedFiles.find(filename)->second;
+ {
+ if (x->second)
+ conf = IncludedFiles.find(filename)->second;
+ else
+ {
+ errorstream << "File " << filename << " could not be opened." << std::endl;
+ return false;
+ }
+ }
}
/* Start reading characters... */
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)
{