X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_static.cpp;h=23f30e1dffa46d795c6714b4fbbdd03dfe1225d5;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=bb8fda400bd33b8672a2bb8e26a67bd315b16a51;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index bb8fda400..23f30e1df 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -21,6 +21,7 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
+#include <iostream>
 
 #ifdef PURE_STATIC
 
@@ -95,7 +96,7 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		Modules[name] = mod;
 		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
@@ -107,7 +108,7 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 	{
 		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));
@@ -124,10 +125,10 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		if (prioritizationState == PRIO_STATE_LAST)
 			break;
 		if (tries == 19)
-			ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + name);
+			ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected while loading " + name);
 	}
 
-	ServerInstance->BuildISupport();
+	ServerInstance->ISupport.Build();
 	return true;
 }
 
@@ -188,12 +189,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);
 		}
 	}
@@ -201,15 +202,15 @@ void ModuleManager::LoadAll()
 	for(std::map<std::string, Module*>::iterator i = Modules.begin(); i != Modules.end(); i++)
 	{
 		Module* mod = i->second;
-		try 
+		try
 		{
 			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);
 		}
 	}
@@ -228,7 +229,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);
 		}
 	}