X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_static.cpp;h=4c46241958d0da7f3d7630906a01978e615161c0;hb=21eba8e86b3d7361bc9334b4e15e968ba095db76;hp=b105eea924a23ff478a30e9bfcb7520c96469e11;hpb=ebdaf368e137fc933e648ee88a08a4f83e796f87;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index b105eea92..4c4624195 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -93,10 +93,11 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		mod = (*it->second->init)();
 		mod->ModuleSourceFile = name;
 		mod->ModuleDLLManager = NULL;
+		mod->dying = false;
 		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
@@ -108,7 +109,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));
@@ -125,10 +126,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;
 }
 
@@ -183,6 +184,7 @@ void ModuleManager::LoadAll()
 {
 	Load("cmd_all", true);
 	Load("cmd_whowas.so", true);
+	Load("cmd_lusers.so", true);
 
 	ConfigTagList tags = ServerInstance->Config->ConfTags("module");
 	for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -193,8 +195,8 @@ void ModuleManager::LoadAll()
 
 		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->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);
 		}
 	}
@@ -202,15 +204,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);
-			std::cout << std::endl << "[" << con_red << "*" << con_reset << "]" << LastModuleError << std::endl << std::endl;
+			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);
 		}
 	}
@@ -229,7 +231,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);
 		}
 	}