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

minor: Make logged message in ServerUtils more consistent.

user_profiles
Justin Clark-Casey (justincc) 2013-03-15 22:05:18 +00:00
parent 8cc3adb585
commit 3a7d9f740e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Server/Base/ServerUtils.cs
View File

@ -138,17 +138,17 @@ namespace OpenSim.Server.Base
case ExtensionChange.Add: case ExtensionChange.Add:
if (a.AddinFile.Contains(Registry.DefaultAddinsFolder)) if (a.AddinFile.Contains(Registry.DefaultAddinsFolder))
{ {
m_log.InfoFormat("[SERVER]: Adding {0} from registry", a.Name); m_log.InfoFormat("[SERVER UTILS]: Adding {0} from registry", a.Name);
connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.')); } connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.')); }
else else
{ {
m_log.InfoFormat("[SERVER]: Adding {0} from ./bin", a.Name); m_log.InfoFormat("[SERVER UTILS]: Adding {0} from ./bin", a.Name);
connector.PluginPath = a.AddinFile; connector.PluginPath = a.AddinFile;
} }
LoadPlugin(connector); LoadPlugin(connector);
break; break;
case ExtensionChange.Remove: case ExtensionChange.Remove:
m_log.InfoFormat("[SERVER]: Removing {0}", a.Name); m_log.InfoFormat("[SERVER UTILS]: Removing {0}", a.Name);
UnloadPlugin(connector); UnloadPlugin(connector);
break; break;
} }
@ -166,13 +166,13 @@ namespace OpenSim.Server.Base
} }
else else
{ {
m_log.InfoFormat("[SERVER]: {0} Disabled.", connector.ConfigName); m_log.InfoFormat("[SERVER UTILS]: {0} Disabled.", connector.ConfigName);
} }
} }
private void UnloadPlugin(IRobustConnector connector) private void UnloadPlugin(IRobustConnector connector)
{ {
m_log.InfoFormat("[Server]: Unloading {0}", connector.ConfigName); m_log.InfoFormat("[SERVER UTILS]: Unloading {0}", connector.ConfigName);
connector.Unload(); connector.Unload();
} }
@ -280,7 +280,7 @@ namespace OpenSim.Server.Base
{ {
if (!(e is System.MissingMethodException)) if (!(e is System.MissingMethodException))
{ {
m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}, {3}", m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}, {3}",
interfaceName, interfaceName,
dllName, dllName,
e.InnerException == null ? e.Message : e.InnerException.Message, e.InnerException == null ? e.Message : e.InnerException.Message,
@ -298,14 +298,14 @@ namespace OpenSim.Server.Base
} }
catch (ReflectionTypeLoadException rtle) catch (ReflectionTypeLoadException rtle)
{ {
m_log.Error(string.Format("Error loading plugin from {0}:\n{1}", dllName, m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin from {0}:\n{1}", dllName,
String.Join("\n", Array.ConvertAll(rtle.LoaderExceptions, e => e.ToString()))), String.Join("\n", Array.ConvertAll(rtle.LoaderExceptions, e => e.ToString()))),
rtle); rtle);
return null; return null;
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error(string.Format("Error loading plugin from {0}", dllName), e); m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin from {0}", dllName), e);
return null; return null;
} }
} }
@ -517,7 +517,7 @@ namespace OpenSim.Server.Base
public static IConfigSource LoadInitialConfig(string url) public static IConfigSource LoadInitialConfig(string url)
{ {
IConfigSource source = new XmlConfigSource(); IConfigSource source = new XmlConfigSource();
m_log.InfoFormat("[CONFIG]: {0} is a http:// URI, fetching ...", url); m_log.InfoFormat("[SERVER UTILS]: {0} is a http:// URI, fetching ...", url);
// The ini file path is a http URI // The ini file path is a http URI
// Try to read it // Try to read it
@ -529,7 +529,7 @@ namespace OpenSim.Server.Base
} }
catch (Exception e) catch (Exception e)
{ {
m_log.FatalFormat("[CONFIG]: Exception reading config from URI {0}\n" + e.ToString(), url); m_log.FatalFormat("[SERVER UTILS]: Exception reading config from URI {0}\n" + e.ToString(), url);
Environment.Exit(1); Environment.Exit(1);
} }