If SVSNICK is sent to force a change to a UID-lookalike, just change nick to UID...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 656e7ce900b808b6be37c91039b507845c7e3c79..529e88b07220e6aceb9e05573b9a3a904396a19a 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -175,7 +175,7 @@ ModuleManager::~ModuleManager()
 bool ModuleManager::Attach(Implementation i, Module* mod)
 {
        if (Modules.find(mod->ModuleSourceFile) == Modules.end())
-               ServerInstance->Logs->Log("MODULE", DEFAULT, "Module %s is attaching to hook %d in constructor; this does not handle exceptions correctly!", mod->ModuleSourceFile.c_str(), i);
+               ServerInstance->Logs->Log("MODULE", DEFAULT, "Module is attaching to hook %d in constructor; this does not handle exceptions correctly!", i);
 
        if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end())
                return false;
@@ -424,7 +424,7 @@ void ModuleManager::AddService(ServiceProvider& item)
 {
        Module* owner = item.creator;
        if (Modules.find(owner->ModuleSourceFile) == Modules.end())
-               ServerInstance->Logs->Log("MODULE", DEFAULT, "Module %s is registering item %s in constructor; this does not handle exceptions correctly!", owner->ModuleSourceFile.c_str(), item.name.c_str());
+               ServerInstance->Logs->Log("MODULE", DEFAULT, "Module is registering item %s in constructor; this does not handle exceptions correctly!", item.name.c_str());
 
        switch (item.service)
        {
@@ -558,6 +558,8 @@ const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 ConfigReader::ConfigReader()
 {
        this->error = 0;
+       ServerInstance->Logs->Log("MODULE", DEBUG, "ConfigReader is deprecated in 2.0; "
+               "use ServerInstance->Config->ConfValue(\"key\") or ->ConfTags(\"key\") instead");
 }