Argh, i give up

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8594 e03df62e-2008-0410-955e-edbf42e46eb7

5 files changed, 9 insertions, 12 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://"))
 		{
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 21c97a703..923613002 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -488,9 +488,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
 	if (Config->FileErrors)
 	{
-		/* One or more file download/access errors, do not
-		 * proceed to second pass
-		 */
 		for (std::map<std::string, std::istream*>::iterator x = Config->IncludedFiles.begin(); x != Config->IncludedFiles.end(); ++x)
 		{
 			if (!x->second)
@@ -718,6 +715,7 @@ void InspIRCd::BufferedSocketCull()
 {
 	for (std::map<BufferedSocket*,BufferedSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
 	{
+		Log(DEBUG,"Cull socket");
 		SE->DelFd(x->second);
 		x->second->Close();
 		delete x->second;
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 6277dccf4..9ab9e80c1 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -536,6 +536,8 @@ bool BufferedSocket::FlushWriteBuffer()
 
 void SocketTimeout::Tick(time_t)
 {
+	ServerInstance->Log(DEBUG,"SocketTimeout::Tick");
+
 	if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
 		return;
 
diff --git a/src/modules/m_http_client.cpp b/src/modules/m_http_client.cpp
index a75cfd1b2..d29165bff 100644
--- a/src/modules/m_http_client.cpp
+++ b/src/modules/m_http_client.cpp
@@ -123,6 +123,7 @@ HTTPSocket::HTTPSocket(InspIRCd *Instance, ModuleHTTPClient *Mod)
 	this->port = 80;
 	response = NULL;
 	closed = false;
+	timeout_val = 10;
 }
 
 HTTPSocket::~HTTPSocket()
@@ -296,7 +297,7 @@ bool HTTPSocket::OnConnected()
 
 bool HTTPSocket::OnDataReady()
 {
-	Instance->Log(DEBUG,"HTTPSocket::OnDataReady()");
+	Instance->Log(DEBUG,"HTTPSocket::OnDataReady() for %s", url.url.c_str());
 	char *data = this->Read();
 
 	if (!data)
diff --git a/src/modules/m_remoteinclude.cpp b/src/modules/m_remoteinclude.cpp
index d385e194e..aa5370c5c 100644
--- a/src/modules/m_remoteinclude.cpp
+++ b/src/modules/m_remoteinclude.cpp
@@ -92,7 +92,7 @@ class ModuleRemoteInclude : public Module
 			Module* target = ServerInstance->Modules->Find("m_http_client.so");
 			if (target)
 			{
-				ServerInstance->Log(DEBUG,"Claiming schema http://, making fetch request");
+				ServerInstance->Log(DEBUG,"Claiming schema http://, making fetch request for %s", name.c_str());
 
 				HTTPClientRequest* req = new HTTPClientRequest(ServerInstance, this, target, name);
 				req->Send();