X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_reloadmodule.cpp;h=6fcec8ac20cbb0a0f55c13c73d5913320ade5639;hb=754f0130893bacb2b69a32c3de9ed1b3da9659cd;hp=755b49abfb95b73a19f89135aaf07c5ccd3bc94a;hpb=d3eb1a77d7ee2f924ab0fd6e5642fb328e4209d8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 755b49abf..6fcec8ac2 100644
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -236,6 +236,10 @@ class DataKeeper
 	 * @param newmod Newly loaded instance of the module which had its data saved
 	 */
 	void Restore(Module* newmod);
+
+	/** Handle reload failure
+	 */
+	void Fail();
 };
 
 void DataKeeper::DoSaveUsers()
@@ -468,6 +472,14 @@ void DataKeeper::Restore(Module* newmod)
 	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Restore finished");
 }
 
+void DataKeeper::Fail()
+{
+	this->mod = NULL;
+
+	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Restore failed, notifying modules");
+	DoRestoreModules();
+}
+
 void DataKeeper::RestoreObj(const OwnedModesExts& data, Extensible* extensible, ModeType modetype, Modes::ChangeList& modechange)
 {
 	RestoreExtensions(data.extlist, extensible);
@@ -583,11 +595,13 @@ class ReloadAction : public HandlerBase0<void>
 			Module* newmod = ServerInstance->Modules->Find(name);
 			datakeeper.Restore(newmod);
 		}
+		else
+			datakeeper.Fail();
 
 		ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s %ssuccessfully reloaded", passedname.c_str(), result ? "" : "un");
 		User* user = ServerInstance->FindUUID(uuid);
 		if (user)
-			user->WriteNumeric(RPL_LOADEDMODULE, "%s :Module %ssuccessfully reloaded.", passedname.c_str(), result ? "" : "un");
+			user->WriteNumeric(RPL_LOADEDMODULE, passedname, InspIRCd::Format("Module %ssuccessfully reloaded.", (result ? "" : "un")));
 
 		ServerInstance->GlobalCulls.AddItem(this);
 	}
@@ -598,8 +612,7 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
 	Module* m = ServerInstance->Modules->Find(parameters[0]);
 	if (m == creator)
 	{
-		user->WriteNumeric(RPL_LOADEDMODULE, "%s :You cannot reload core_reloadmodule.so (unload and load it)",
-			parameters[0].c_str());
+		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "You cannot reload core_reloadmodule.so (unload and load it)");
 		return CMD_FAILURE;
 	}
 
@@ -613,7 +626,7 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
 	}
 	else
 	{
-		user->WriteNumeric(RPL_LOADEDMODULE, "%s :Could not find module by that name", parameters[0].c_str());
+		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
 		return CMD_FAILURE;
 	}
 }