pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-26 03:46:39 +02:00
Code Activity

Added os_config and support for including additional configuration files.

Browse Source
This commit is contained in:
Adam
2011-03-11 00:47:28 -05:00
parent 97c2e0957d
commit 1ee3d3d810
22 changed files with 891 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/init.cpp
+3 -3
View File
@@ -295,7 +295,7 @@ void Init(int ac, char **av)
{
if (Arg.empty())
throw FatalException("The --config option requires a file name");
services_conf = Arg;
services_conf = ConfigurationFile(Arg, false);
}
if (GetCommandLineArgument("dir", 0, Arg))
@@ -315,9 +315,9 @@ void Init(int ac, char **av)
Log(LOG_TERMINAL) << "Anope " << Anope::Version() << ", " << Anope::Build();
#ifdef _WIN32
Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "\\" << services_conf;
Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "\\" << services_conf.GetName();
#else
Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "/" << services_conf;
Log(LOG_TERMINAL) << "Using configuration file " << services_dir << "/" << services_conf.GetName();
#endif
/* Read configuration file; exit if there are problems. */