diff options
| author |  Attila Molnar | 2015-12-01 12:23:50 +0100 |
|---|---|---|
| committer | Attila Molnar | 2015-12-01 12:23:50 +0100 |
| commit | 44b5a8fa89d8c2bda767c0d5fe77c4d31061ce2b (patch) | |
| tree | 0f1b3d375efd8584858e7df906de6bc322f4b5c6 /src/modules.cpp | |
| parent | Merge branch 'master+whowas-purge-empty' (diff) | |
| parent | core_reloadmodule Allow modules to handle reload failures of other mods (diff) | |
| download | inspircd++-44b5a8fa89d8c2bda767c0d5fe77c4d31061ce2b.tar.gz inspircd++-44b5a8fa89d8c2bda767c0d5fe77c4d31061ce2b.tar.bz2 inspircd++-44b5a8fa89d8c2bda767c0d5fe77c4d31061ce2b.zip | |
Merge branch 'master+reloadmod'
Diffstat (limited to 'src/modules.cpp')
| -rw-r--r-- | src/modules.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/modules.cpp b/src/modules.cpp index 9e653a4ab..79a71652c 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -451,26 +451,6 @@ namespace ServerInstance->GlobalCulls.AddItem(this); } }; - - struct ReloadAction : public HandlerBase0<void> - { - Module* const mod; - HandlerBase1<void, bool>* const callback; - ReloadAction(Module* m, HandlerBase1<void, bool>* c) - : mod(m), callback(c) {} - void Call() - { - DLLManager* dll = mod->ModuleDLLManager; - std::string name = mod->ModuleSourceFile; - ServerInstance->Modules->DoSafeUnload(mod); - ServerInstance->GlobalCulls.Apply(); - delete dll; - bool rv = ServerInstance->Modules->Load(name); - if (callback) - callback->Call(rv); - ServerInstance->GlobalCulls.AddItem(this); - } - }; } bool ModuleManager::Unload(Module* mod) @@ -481,14 +461,6 @@ bool ModuleManager::Unload(Module* mod) return true; } -void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback) -{ - if (CanUnload(mod)) - ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback)); - else if (callback) - callback->Call(false); -} - void ModuleManager::LoadAll() { std::map<std::string, ServiceList> servicemap; |