-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
#include "xline.h"
#include "socket.h"
#include "command_parse.h"
#include "dns.h"
#include "exitcodes.h"
+#include <iostream>
-#ifndef WIN32
+#ifndef _WIN32
#include <dirent.h>
#endif
#ifndef PURE_STATIC
-bool ModuleManager::Load(const char* filename)
+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 (strchr(filename, '/'))
- return false;
- /* Do we have a glob pattern in the filename?
- * The user wants to load multiple modules which
- * match the pattern.
- */
- if (strchr(filename,'*') || (strchr(filename,'?')))
+ if (filename.find('/') != std::string::npos)
{
- int n_match = 0;
- DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
- if (library)
- {
- /* Try and locate and load all modules matching the pattern */
- dirent* entry = NULL;
- while (0 != (entry = readdir(library)))
- {
- if (entry->d_name[0] == '.')
- continue;
- if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map))
- {
- if (!this->Load(entry->d_name))
- n_match++;
- }
- }
- closedir(library);
- }
- /* Loadmodule will now return false if any one of the modules failed
- * to load (but wont abort when it encounters a bad one) and when 1 or
- * more modules were actually loaded.
- */
- return (n_match > 0 ? false : true);
+ 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);
- std::string filename_str = filename;
+ snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename.c_str());
if (!ServerConfig::FileExists(modfile))
{
- LastModuleError = "Module file could not be found: " + filename_str;
+ LastModuleError = "Module file could not be found: " + filename;
ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
return false;
}
- if (Modules.find(filename_str) != Modules.end())
+ if (Modules.find(filename) != Modules.end())
{
- LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!";
+ LastModuleError = "Module " + filename + " is already loaded, cannot load a module twice!";
ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
return false;
}
if (newmod)
{
- newmod->ModuleSourceFile = filename_str;
+ newmod->ModuleSourceFile = filename;
newmod->ModuleDLLManager = newhandle;
- Modules[filename_str] = newmod;
- newmod->init();
+ 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(), version.c_str());
+ }
+ else
+ {
+ newmod->init();
- Version v = newmod->GetVersion();
- ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s",
- filename, newhandle->GetVersion().c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+ Version v = newmod->GetVersion();
+ ServerInstance->Logs->Log("MODULE", 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_str + ": " + newhandle->LastError();
+ LastModuleError = "Unable to load " + filename + ": " + newhandle->LastError();
ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
delete newhandle;
return false;
{
// failure in module constructor
if (newmod)
+ {
DoSafeUnload(newmod);
- delete newmod;
- delete newhandle;
- LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
+ ServerInstance->GlobalCulls.AddItem(newhandle);
+ }
+ else
+ delete newhandle;
+ LastModuleError = "Unable to load " + filename + ": " + modexcept.GetReason();
ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
return false;
}
this->ModCount++;
- FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod));
+ if (defer)
+ return true;
+ FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod));
/* We give every module a chance to re-prioritize when we introduce a new one,
* not just the one thats loading, as the new module could affect the preference
* of others
if (prioritizationState == PRIO_STATE_LAST)
break;
if (tries == 19)
- ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str);
+ ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename);
}
ServerInstance->BuildISupport();
{
if (CanUnload(mod))
ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
- else
+ else if (callback)
callback->Call(false);
}
{
ModCount = 0;
- printf("\nLoading core commands");
+ std::cout << std::endl << "Loading core commands";
fflush(stdout);
DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
{
if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
{
- printf(".");
+ std::cout << ".";
fflush(stdout);
- if (!Load(entry->d_name))
+ 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");
{
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.c_str()))
+ 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);
}
}
-}
-void ModuleManager::UnloadAll()
-{
- /* We do this more than once, so that any service providers get a
- * chance to be unhooked by the modules using them, but then get
- * a chance to be removed themsleves.
- *
- * Note: this deliberately does NOT delete the DLLManager objects
+ for(std::map<std::string, Module*>::iterator i = Modules.begin(); i != Modules.end(); i++)
+ {
+ Module* mod = i->second;
+ try
+ {
+ ServerInstance->Logs->Log("MODULE", 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);
+ std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
+ ServerInstance->Exit(EXIT_STATUS_MODULE);
+ }
+ }
+
+ /* We give every module a chance to re-prioritize when we introduce a new one,
+ * not just the one thats loading, as the new module could affect the preference
+ * of others
*/
- for (int tries = 0; tries < 4; tries++)
+ for(int tries = 0; tries < 20; tries++)
{
- std::map<std::string, Module*>::iterator i = Modules.begin();
- while (i != Modules.end())
+ prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
+ for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
+ n->second->Prioritize();
+
+ if (prioritizationState == PRIO_STATE_LAST)
+ break;
+ if (tries == 19)
{
- std::map<std::string, Module*>::iterator me = i++;
- if (CanUnload(me->second))
- {
- DoSafeUnload(me->second);
- }
+ ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected");
+ ServerInstance->Exit(EXIT_STATUS_MODULE);
}
- ServerInstance->GlobalCulls.Apply();
}
}
projects / user / henk / code / inspircd.git / blobdiff