Merge pull request #1157 from SaberUK/insp20+fix-cron-restart

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

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index e613508df8d333f503ff1412cb41179d5838413c..050f41c758379e7581fea0054287a3532d885c7e 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -24,8 +24,9 @@
 #include "command_parse.h"
 #include "dns.h"
 #include "exitcodes.h"
+#include <iostream>
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <dirent.h>
 #endif
 
@@ -35,7 +36,10 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 {
        /* Don't allow people to specify paths for modules, it doesn't work as expected */
        if (filename.find('/') != std::string::npos)
+       {
+               LastModuleError = "You can't load modules with a path: " + filename;
                return false;
+       }
 
        char modfile[MAXBUF];
        snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename.c_str());
@@ -65,11 +69,13 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                {
                        newmod->ModuleSourceFile = filename;
                        newmod->ModuleDLLManager = newhandle;
+                       newmod->dying = false;
                        Modules[filename] = newmod;
+                       std::string version = newhandle->GetVersion();
                        if (defer)
                        {
                                ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)",
-                                       filename.c_str(), newhandle->GetVersion().c_str());
+                                       filename.c_str(), version.c_str());
                        }
                        else
                        {
@@ -77,7 +83,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 
                                Version v = newmod->GetVersion();
                                ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s",
-                                       filename.c_str(), newhandle->GetVersion().c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+                                       filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
                        }
                }
                else
@@ -92,7 +98,10 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
        {
                // failure in module constructor
                if (newmod)
+               {
                        DoSafeUnload(newmod);
+                       ServerInstance->GlobalCulls.AddItem(newhandle);
+               }
                else
                        delete newhandle;
                LastModuleError = "Unable to load " + filename + ": " + modexcept.GetReason();
@@ -173,7 +182,7 @@ void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
 {
        if (CanUnload(mod))
                ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-       else
+       else if (callback)
                callback->Call(false);
 }
 
@@ -182,7 +191,7 @@ void ModuleManager::LoadAll()
 {
        ModCount = 0;
 
-       printf("\nLoading core commands");
+       std::cout << std::endl << "Loading core commands";
        fflush(stdout);
 
        DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
@@ -193,19 +202,19 @@ void ModuleManager::LoadAll()
                {
                        if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
                        {
-                               printf(".");
+                               std::cout << ".";
                                fflush(stdout);
 
                                if (!Load(entry->d_name, true))
                                {
                                        ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
-                                       printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
+                                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
                                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                                }
                        }
                }
                closedir(library);
-               printf("\n");
+               std::cout << std::endl;
        }
 
        ConfigTagList tags = ServerInstance->Config->ConfTags("module");
@@ -213,12 +222,12 @@ void ModuleManager::LoadAll()
        {
                ConfigTag* tag = i->second;
                std::string name = tag->getString("name");
-               printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",name.c_str());
+               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());
-                       printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
+                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
        }
@@ -226,7 +235,7 @@ void ModuleManager::LoadAll()
        for(std::map<std::string, Module*>::iterator i = Modules.begin(); i != Modules.end(); i++)
        {
                Module* mod = i->second;
-               try 
+               try
                {
                        ServerInstance->Logs->Log("MODULE", DEBUG, "Initializing %s", i->first.c_str());
                        mod->init();
@@ -235,7 +244,7 @@ void ModuleManager::LoadAll()
                {
                        LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
                        ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-                       printf_c("\n[\033[1;31m*\033[0m] %s\n\n", LastModuleError.c_str());
+                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
        }