Clean up CoreException

[user/henk/code/inspircd.git] / src / modmanager_static.cpp

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index a8ba83274ea4fbe45e14a8999243d803e1bf5508..76f16fa92fd140e2594a0ab9062c70b46c99f2b2 100644 (file)
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#define MODNAME cmd_all
+#define MODNAME "cmd_all"
 
 #include "inspircd.h"
 #include "exitcodes.h"
@@ -58,7 +58,6 @@ class AllModule : public Module
                        {
                                Command* c = (*i)(this);
                                cmds.push_back(c);
-                               ServerInstance->AddCommand(c);
                        }
                }
                catch (...)
@@ -88,151 +87,62 @@ bool ModuleManager::Load(const std::string& name, bool defer)
        if (it == modlist->end())
                return false;
        Module* mod = NULL;
+
+       ServiceList newservices;
+       if (!defer)
+               this->NewServices = &newservices;
+
        try
        {
                mod = (*it->second->init)();
                mod->ModuleSourceFile = name;
                mod->ModuleDLLManager = NULL;
+               mod->dying = false;
                Modules[name] = mod;
+               this->NewServices = NULL;
                if (defer)
                {
-                       ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s", name.c_str());
+                       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s", name.c_str());
                        return true;
                }
                else
                {
+                       ConfigStatus confstatus;
+
+                       AttachAll(mod);
+                       AddServices(newservices);
                        mod->init();
+                       mod->ReadConfig(confstatus);
                }
        }
        catch (CoreException& modexcept)
        {
+               this->NewServices = NULL;
+
                if (mod)
                        DoSafeUnload(mod);
-               ServerInstance->Logs->Log("MODULE", DEFAULT, "Unable to load " + name + ": " + modexcept.GetReason());
+               ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Unable to load " + name + ": " + modexcept.GetReason());
                return false;
        }
-       FOREACH_MOD(I_OnLoadModule,OnLoadModule(mod));
-       /* We give every module a chance to re-prioritize when we introduce a new one,
-        * not just the one thats loading, as the new module could affect the preference
-        * of others
-        */
-       for(int tries = 0; tries < 20; tries++)
-       {
-               prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
-               for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
-                       n->second->Prioritize();
-
-               if (prioritizationState == PRIO_STATE_LAST)
-                       break;
-               if (tries == 19)
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + name);
-       }
 
+       FOREACH_MOD(OnLoadModule, (mod));
+       PrioritizeHooks();
        ServerInstance->ISupport.Build();
        return true;
 }
 
-namespace {
-       struct UnloadAction : public HandlerBase0<void>
-       {
-               Module* const mod;
-               UnloadAction(Module* m) : mod(m) {}
-               void Call()
-               {
-                       ServerInstance->Modules->DoSafeUnload(mod);
-                       ServerInstance->GlobalCulls.Apply();
-                       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()
-               {
-                       std::string name = mod->ModuleSourceFile;
-                       ServerInstance->Modules->DoSafeUnload(mod);
-                       ServerInstance->GlobalCulls.Apply();
-                       bool rv = ServerInstance->Modules->Load(name.c_str());
-                       callback->Call(rv);
-                       ServerInstance->GlobalCulls.AddItem(this);
-               }
-       };
-}
-
-bool ModuleManager::Unload(Module* mod)
-{
-       if (!CanUnload(mod))
-               return false;
-       ServerInstance->AtomicActions.AddAction(new UnloadAction(mod));
-       return true;
-}
-
-void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
+void ModuleManager::LoadCoreModules(std::map<std::string, ServiceList>& servicemap)
 {
-       if (CanUnload(mod))
-               ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-       else
-               callback->Call(false);
-}
-
-void ModuleManager::LoadAll()
-{
-       Load("cmd_all", true);
-       Load("cmd_whowas.so", true);
-
-       ConfigTagList tags = ServerInstance->Config->ConfTags("module");
-       for(ConfigIter i = tags.first; i != tags.second; ++i)
-       {
-               ConfigTag* tag = i->second;
-               std::string name = tag->getString("name");
-               std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
-
-               if (!this->Load(name, true))
-               {
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
-                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
-                       ServerInstance->Exit(EXIT_STATUS_MODULE);
-               }
-       }
-
-       for(std::map<std::string, Module*>::iterator i = Modules.begin(); i != Modules.end(); i++)
+       for (modmap::const_iterator i = modlist->begin(); i != modlist->end(); ++i)
        {
-               Module* mod = i->second;
-               try
-               {
-                       mod->init();
-               }
-               catch (CoreException& modexcept)
-               {
-                       LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
-                       ServerInstance->Exit(EXIT_STATUS_MODULE);
-               }
-       }
-
-       /* We give every module a chance to re-prioritize when we introduce a new one,
-        * not just the one thats loading, as the new module could affect the preference
-        * of others
-        */
-       for(int tries = 0; tries < 20; tries++)
-       {
-               prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
-               for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
-                       n->second->Prioritize();
-
-               if (prioritizationState == PRIO_STATE_LAST)
-                       break;
-               if (tries == 19)
+               const std::string modname = i->first;
+               if (modname[0] == 'c')
                {
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected");
-                       ServerInstance->Exit(EXIT_STATUS_MODULE);
+                       this->NewServices = &servicemap[modname];
+                       Load(modname, true);
                }
        }
+       this->NewServices = NULL;
 }
 
 #endif