X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_rehash.cpp;h=ed972007d61d7a1c83e763352faf8748bfb878fd;hb=4c83624ed825ca123401a45c8d2844ba6453a85b;hp=815e241f0d51023d9fec138be51b05bc001e8adf;hpb=8b8923d15564caeeb14a6c5a218b9936a93c3ae4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index 815e241f0..ed972007d 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -11,22 +11,20 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "commands/cmd_rehash.h"
 
 
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
 	return new cmd_rehash(Instance);
 }
 
 CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
-	std::string parameter = "";
+	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+	std::string parameter;
 	std::string old_disabled = ServerInstance->Config->DisabledCommands;
 	if (pcnt)
 	{
@@ -34,21 +32,23 @@ CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
 	}
 	else
 	{
-		ServerInstance->WriteOpers("*** %s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(CONFIG_FILE));
+		ServerInstance->WriteOpers("*** %s is rehashing config file %s",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
 		ServerInstance->CloseLog();
-		ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc);
+		if (!ServerInstance->OpenLog(ServerInstance->Config->argv, ServerInstance->Config->argc))
+			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->Res->Rehash();
 		ServerInstance->ResetMaxBans();
-		ServerInstance->BuildISupport();
 	}
 	if (old_disabled != ServerInstance->Config->DisabledCommands)
 		InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
 
 	FOREACH_MOD(I_OnRehash,OnRehash(user, parameter));
 
+	ServerInstance->BuildISupport();
+
 	return CMD_SUCCESS;
 }