X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_dynamic.cpp;h=adff8630d523e2b4b285db5f40be5c70a82955b6;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=e613508df8d333f503ff1412cb41179d5838413c;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index e613508df..adff8630d 100644
--- 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
 
@@ -43,14 +44,14 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 	if (!ServerConfig::FileExists(modfile))
 	{
 		LastModuleError = "Module file could not be found: " + filename;
-		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
 		return false;
 	}
 
 	if (Modules.find(filename) != Modules.end())
 	{
 		LastModuleError = "Module " + filename + " is already loaded, cannot load a module twice!";
-		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
 		return false;
 	}
 
@@ -66,24 +67,25 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 			newmod->ModuleSourceFile = filename;
 			newmod->ModuleDLLManager = newhandle;
 			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());
+				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT,"New module introduced: %s (Module version %s)",
+					filename.c_str(), version.c_str());
 			}
 			else
 			{
 				newmod->init();
 
 				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]"));
+				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT,"New module introduced: %s (Module version %s)%s",
+					filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
 			}
 		}
 		else
 		{
 			LastModuleError = "Unable to load " + filename + ": " + newhandle->LastError();
-			ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
 			delete newhandle;
 			return false;
 		}
@@ -92,11 +94,14 @@ 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();
-		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
 		return false;
 	}
 
@@ -118,10 +123,10 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 		if (prioritizationState == PRIO_STATE_LAST)
 			break;
 		if (tries == 19)
-			ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename);
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected while loading " + filename);
 	}
 
-	ServerInstance->BuildISupport();
+	ServerInstance->ISupport.Build();
 	return true;
 }
 
@@ -182,7 +187,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 +198,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());
+					ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());
+					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 +218,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());
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());
+			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
 			ServerInstance->Exit(EXIT_STATUS_MODULE);
 		}
 	}
@@ -226,16 +231,16 @@ 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());
+			ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Initializing %s", i->first.c_str());
 			mod->init();
 		}
 		catch (CoreException& modexcept)
 		{
 			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());
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
+			std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
 			ServerInstance->Exit(EXIT_STATUS_MODULE);
 		}
 	}
@@ -254,7 +259,7 @@ void ModuleManager::LoadAll()
 			break;
 		if (tries == 19)
 		{
-			ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected");
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected");
 			ServerInstance->Exit(EXIT_STATUS_MODULE);
 		}
 	}