summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-11 18:11:42 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-11 18:11:42 +0000
commit461e4aef03d8d0f4570d878ef1656a574e1b791d (patch)
tree2e911a00d36fcfa9197aaf2bdc76b915d0e67f07 /src
parent05e88fcd544e3cc22cfdd080a829cf835531d6ee (diff)
More stuff for this. Its starting to take shape a bit now, and is tidier than the craq i came up with before
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8567 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/commands/cmd_rehash.cpp2
-rw-r--r--src/configreader.cpp71
-rw-r--r--src/server.cpp4
3 files changed, 57 insertions, 20 deletions
diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index 89c8b9e14..83b055650 100644
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -39,7 +39,7 @@ CmdResult CommandRehash::Handle (const char** parameters, int pcnt, User *user)
user->WriteServ("*** NOTICE %s :ERROR: Could not open logfile %s: %s", user->nick, ServerInstance->Config->logpath.c_str(), strerror(errno));
ServerInstance->RehashUsersAndChans();
FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
- ServerInstance->Config->Read(false,user);
+ /*ServerInstance->Config->Read(false,user);*/
// Get XLine to do it's thing.
ServerInstance->XLines->CheckELines();
ServerInstance->XLines->ApplyLines();
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 312c0d949..2852dc727 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1238,22 +1238,47 @@ void ServerConfig::Read(bool bail, User* user, int pass)
bool ServerConfig::Downloading()
{
/* Returns true if there are still files in the process of downloading */
- return true;
+ return (TotalDownloaded >= IncludedFiles.size());
}
void ServerConfig::StartDownloads()
{
+ TotalDownloaded = 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());
+ if ((x->first[0] == '/') || (x->first.substr(7) == "file://"))
+ {
+ /* 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());
+ if (!conf->fail())
+ {
+ ServerInstance->Log(DEBUG,"file:// schema file %s loaded OK", x->first.c_str());
+ x->second = conf;
+ }
+
+ TotalDownloaded++;
+ }
+ else
+ {
+ /* Modules handle these */
+ ServerInstance->Log(DEBUG,"Module-handled schema for %s", x->first.c_str());
+ }
}
}
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;
@@ -1266,26 +1291,38 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
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)
- {
- 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
+ conf = new std::ifstream(filename);
+ if (conf->fail())
{
- /* 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;
+ errorstream << "File " << filename << " could not be opened." << std::endl;
return false;
}
}
else
- conf = IncludedFiles.find(filename)->second;
+ {
+ /* Check if the file open failed first */
+ if (IncludedFiles.find(filename) == 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
+ conf = IncludedFiles.find(filename)->second;
+ }
/* Start reading characters... */
while (conf->get(ch))
diff --git a/src/server.cpp b/src/server.cpp
index caeaa463b..2526eac37 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -54,7 +54,7 @@ void InspIRCd::Rehash()
this->WriteOpers("*** ERROR: Could not open logfile %s: %s", Config->logpath.c_str(), strerror(errno));
this->RehashUsersAndChans();
FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
- this->Config->Read(false,NULL);
+ /*this->Config->Read(false,NULL);*/
this->ResetMaxBans();
this->Res->Rehash();
FOREACH_MOD_I(this,I_OnRehash,OnRehash(NULL,""));
@@ -65,7 +65,7 @@ void InspIRCd::RehashServer()
{
this->WriteOpers("*** Rehashing config file");
this->RehashUsersAndChans();
- this->Config->Read(false,NULL);
+ /*this->Config->Read(false,NULL);*/
this->ResetMaxBans();
this->Res->Rehash();
}