X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=4814852c499bfc31f570108eb6ed0b50a4b76fe6;hb=20680f9c4964a5e10e3649a1e479078ff85c5c85;hp=a73abcac271e2b06c05c78798bf04b1e7e8827d2;hpb=4426a2fc448f332e42a7e6ff778e5047bb588c98;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index a73abcac2..4814852c4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -6,7 +6,7 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -47,25 +47,30 @@ void InspIRCd::Exit(int status)
 void InspIRCd::Rehash()
 {
 	this->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
-	this->CloseLog();
-	if (!this->OpenLog(this->Config->argv, this->Config->argc))
-		this->SNO->WriteToSnoMask('A', "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->ResetMaxBans();
-	this->Res->Rehash();
-	FOREACH_MOD_I(this,I_OnRehash,OnRehash(NULL,""));
-	this->BuildISupport();
+	if (!this->ConfigThread)
+	{
+		Config->RehashUser = NULL;
+		Config->RehashParameter = "";
+
+		ConfigThread = new ConfigReaderThread(this, false, NULL);
+		Threads->Create(ConfigThread);
+	}
 }
 
 void InspIRCd::RehashServer()
 {
 	this->SNO->WriteToSnoMask('A', "Rehashing config file");
 	this->RehashUsersAndChans();
-	/*this->Config->Read(false,NULL);*/
-	this->ResetMaxBans();
-	this->Res->Rehash();
+	if (!this->ConfigThread)
+	{
+		Config->RehashUser = NULL;
+		Config->RehashParameter = "";
+
+		ConfigThread = new ConfigReaderThread(this, false, NULL);
+		Threads->Create(ConfigThread);
+	}
 }
 
 std::string InspIRCd::GetVersionString()
@@ -106,7 +111,7 @@ void InspIRCd::AddServerName(const std::string &servername)
 		if(**itr == servername)
 			return;
 
-	string * ns = new string(servername);
+	std::string * ns = new std::string(servername);
 	servernames.push_back(ns);
 }
 
@@ -117,7 +122,7 @@ const char* InspIRCd::FindServerNamePtr(const std::string &servername)
 		if(**itr == servername)
 			return (*itr)->c_str();
 
-	servernames.push_back(new string(servername));
+	servernames.push_back(new std::string(servername));
 	itr = --servernames.end();
 	return (*itr)->c_str();
 }