diff options
| author | Adam <Adam@anope.org> | 2012-05-06 21:43:50 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-05-06 21:43:50 -0400 |
| commit | 675b113c3e03cf1917b2a731c21fe82b5f1f2b2b (patch) | |
| tree | 6a80aaeafa829a3cef5c41c938d92ffedd1bdad8 /src/modulemanager.cpp | |
| parent | eb0e07d5645c06eb034cfcfbf91883158ba9dc00 (diff) | |
Split up db/conf/lib/locale install directories, and allow alternate ones to be specified at runtime
Diffstat (limited to 'src/modulemanager.cpp')
| -rw-r--r-- | src/modulemanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index dd41d3940..57b8f850e 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -22,7 +22,7 @@ std::vector<Module *> ModuleManager::EventHandlers[I_END]; void ModuleManager::CleanupRuntimeDirectory() { - Anope::string dirbuf = services_dir + "/modules/runtime"; + Anope::string dirbuf = modules_dir + "/modules/runtime"; Log(LOG_DEBUG) << "Cleaning out Module run time directory (" << dirbuf << ") - this may take a moment please wait"; @@ -57,7 +57,7 @@ void ModuleManager::CleanupRuntimeDirectory() */ static ModuleReturn moduleCopyFile(const Anope::string &name, Anope::string &output) { - Anope::string input = services_dir + "/modules/" + name + ".so"; + Anope::string input = modules_dir + "/modules/" + name + ".so"; struct stat s; if (stat(input.c_str(), &s) == -1) @@ -134,14 +134,14 @@ ModuleReturn ModuleManager::LoadModule(const Anope::string &modname, User *u) Log(LOG_DEBUG) << "trying to load [" << modname << "]"; /* Generate the filename for the temporary copy of the module */ - Anope::string pbuf = services_dir + "/modules/runtime/" + modname + ".so.XXXXXX"; + Anope::string pbuf = modules_dir + "/modules/runtime/" + modname + ".so.XXXXXX"; /* Don't skip return value checking! -GD */ ModuleReturn ret = moduleCopyFile(modname, pbuf); if (ret != MOD_ERR_OK) { if (ret == MOD_ERR_NOEXIST) - Log(LOG_TERMINAL) << "Error while loading " << modname << " (file not exists)"; + Log(LOG_TERMINAL) << "Error while loading " << modname << " (file does not exist)"; else if (ret == MOD_ERR_FILE_IO) Log(LOG_TERMINAL) << "Error while loading " << modname << " (file IO error, check file permissions and diskspace)"; return ret; |