OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert tabs to spaces from previous commit 8c2b41b01

master-beforevarregion^2
Justin Clark-Casey (justincc) 2014-01-28 00:04:55 +00:00
parent 8c2b41b01d
commit f7172095e0
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -124,7 +124,7 @@ namespace OpenSim
else else
{ {
Application.iniFilePath = Path.GetFullPath( Application.iniFilePath = Path.GetFullPath(
Path.Combine(Util.configDir(), iniFileName)); Path.Combine(Util.configDir(), iniFileName));
if (!File.Exists(Application.iniFilePath)) if (!File.Exists(Application.iniFilePath))
{ {
@ -154,14 +154,14 @@ namespace OpenSim
} }
} }
// Override distro settings with contents of inidirectory // Override distro settings with contents of inidirectory
string iniDirName = startupConfig.GetString("inidirectory", "config"); string iniDirName = startupConfig.GetString("inidirectory", "config");
string iniDirPath = Path.Combine(Util.configDir(), iniDirName); string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
if (Directory.Exists(iniDirPath)) if (Directory.Exists(iniDirPath))
{ {
m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath); m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
List<string> overrideSources = new List<string>(); List<string> overrideSources = new List<string>();
string[] fileEntries = Directory.GetFiles(iniDirName); string[] fileEntries = Directory.GetFiles(iniDirName);
foreach (string filePath in fileEntries) foreach (string filePath in fileEntries)
@ -169,45 +169,45 @@ namespace OpenSim
if (Path.GetExtension(filePath).ToLower() == ".ini") if (Path.GetExtension(filePath).ToLower() == ".ini")
{ {
if (!sources.Contains(Path.GetFullPath(filePath))) if (!sources.Contains(Path.GetFullPath(filePath)))
{ {
overrideSources.Add(Path.GetFullPath(filePath)); overrideSources.Add(Path.GetFullPath(filePath));
// put it in sources too, to avoid circularity // put it in sources too, to avoid circularity
sources.Add(Path.GetFullPath(filePath)); sources.Add(Path.GetFullPath(filePath));
} }
} }
} }
if (overrideSources.Count > 0) if (overrideSources.Count > 0)
{ {
OpenSimConfigSource overrideConfig = new OpenSimConfigSource(); OpenSimConfigSource overrideConfig = new OpenSimConfigSource();
overrideConfig.Source = new IniConfigSource(); overrideConfig.Source = new IniConfigSource();
for (int i = 0 ; i < overrideSources.Count ; i++) for (int i = 0 ; i < overrideSources.Count ; i++)
{ {
if (ReadConfig(overrideConfig, overrideSources[i])) if (ReadConfig(overrideConfig, overrideSources[i]))
{ {
iniFileExists = true; iniFileExists = true;
AddIncludes(overrideConfig, overrideSources); AddIncludes(overrideConfig, overrideSources);
} }
} }
m_config.Source.Merge(overrideConfig.Source); m_config.Source.Merge(overrideConfig.Source);
} }
} }
if (sources.Count == 0) if (sources.Count == 0)
{ {
m_log.FatalFormat("[CONFIG]: Could not load any configuration"); m_log.FatalFormat("[CONFIG]: Could not load any configuration");
Environment.Exit(1); Environment.Exit(1);
} }
else if (!iniFileExists) else if (!iniFileExists)
{ {
m_log.FatalFormat("[CONFIG]: Could not load any configuration"); m_log.FatalFormat("[CONFIG]: Could not load any configuration");
m_log.FatalFormat("[CONFIG]: Configuration exists, but there was an error loading it!"); m_log.FatalFormat("[CONFIG]: Configuration exists, but there was an error loading it!");
Environment.Exit(1); Environment.Exit(1);
} }
// Make sure command line options take precedence // Make sure command line options take precedence
m_config.Source.Merge(argvSource); m_config.Source.Merge(argvSource);
IConfig enVars = m_config.Source.Configs["Environment"]; IConfig enVars = m_config.Source.Configs["Environment"];