summaryrefslogtreecommitdiff
path: root/src/configreader.cpp
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-12 01:33:13 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-11-12 01:33:13 +0000
commit8d278b5d9cba6c5b41477994e7a567c9218d2c3f (patch)
tree39f3561f204a504b91aed5219296f3d28597417c /src/configreader.cpp
parentc23f9303db81152ae241fca9ac3076d6ad80e874 (diff)
Argh, i give up
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8594 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/configreader.cpp')
-rw-r--r--src/configreader.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 4cdfcaf28..47c8ec234 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1283,12 +1283,6 @@ void ServerConfig::Complete(const std::string &filename, bool error)
x->second = NULL;
FileErrors++;
}
- else
- {
- ServerInstance->Log(DEBUG,"Recursively follow conf %s", x->first.c_str());
- LoadConf(newconfig, x->first.c_str(), errstr, 0, x->second);
- StartDownloads();
- }
TotalDownloaded++;
}
@@ -1297,7 +1291,7 @@ void ServerConfig::Complete(const std::string &filename, bool error)
void ServerConfig::StartDownloads()
{
- ServerInstance->Log(DEBUG,"StartDownloads() size=%d", IncludedFiles.size());
+ ServerInstance->Log(DEBUG,"((((((((((((((((((((((((( StartDownloads() size=%d )))))))))))))))))))))))))))))))))))))", IncludedFiles.size());
/* 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)
@@ -1305,6 +1299,8 @@ void ServerConfig::StartDownloads()
if (CompletedFiles.find(x->first) != CompletedFiles.end())
continue;
+ ServerInstance->Log(DEBUG,"StartDownloads File: %s", x->first.c_str());
+
std::string file = x->first;
if ((file[0] == '/') || (file.substr(0, 7) == "file://"))
{