From deb18ee9cfa531a87141aea61171c6899ef7d687 Mon Sep 17 00:00:00 2001
From: attilamolnar
Date: Sun, 8 Sep 2013 17:21:01 +0200
Subject: Remove InspIRCd::HandleRehash functor

Call InspIRCd::Rehash() from cmd_rehash and from the SIGHUP handler
---
 src/server.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index 97b4058c0..4f58c881d 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -31,7 +31,8 @@ void InspIRCd::SignalHandler(int signal)
 #else
 	if (signal == SIGHUP)
 	{
-		Rehash("Caught SIGHUP");
+		ServerInstance->SNO->WriteGlobalSno('a', "Rehashing due to SIGHUP");
+		Rehash();
 	}
 	else if (signal == SIGTERM)
 #endif
@@ -55,13 +56,11 @@ void InspIRCd::Exit(int status)
 	exit (status);
 }
 
-void RehashHandler::Call(const std::string &reason)
+void InspIRCd::Rehash(const std::string& uuid)
 {
-	ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str());
-	FOREACH_MOD(OnGarbageCollect, ());
 	if (!ServerInstance->ConfigThread)
 	{
-		ServerInstance->ConfigThread = new ConfigReaderThread("");
+		ServerInstance->ConfigThread = new ConfigReaderThread(uuid);
 		ServerInstance->Threads->Start(ServerInstance->ConfigThread);
 	}
 }
-- 
cgit v1.3.1-10-gc9f91