diff options
author | Justin Clark-Casey (justincc) | 2013-03-15 22:05:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-15 22:05:18 +0000 |
commit | 3a7d9f740e3574bb3091d40fa35c7abf642c1f3c (patch) | |
tree | fe0fb6aa7ee381b353bb05a130865be96801d5e5 | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-3a7d9f740e3574bb3091d40fa35c7abf642c1f3c.zip opensim-SC_OLD-3a7d9f740e3574bb3091d40fa35c7abf642c1f3c.tar.gz opensim-SC_OLD-3a7d9f740e3574bb3091d40fa35c7abf642c1f3c.tar.bz2 opensim-SC_OLD-3a7d9f740e3574bb3091d40fa35c7abf642c1f3c.tar.xz |
minor: Make logged message in ServerUtils more consistent.
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 2e6d279..210a314 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -138,17 +138,17 @@ namespace OpenSim.Server.Base | |||
138 | case ExtensionChange.Add: | 138 | case ExtensionChange.Add: |
139 | if (a.AddinFile.Contains(Registry.DefaultAddinsFolder)) | 139 | if (a.AddinFile.Contains(Registry.DefaultAddinsFolder)) |
140 | { | 140 | { |
141 | m_log.InfoFormat("[SERVER]: Adding {0} from registry", a.Name); | 141 | m_log.InfoFormat("[SERVER UTILS]: Adding {0} from registry", a.Name); |
142 | connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.')); } | 142 | connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.')); } |
143 | else | 143 | else |
144 | { | 144 | { |
145 | m_log.InfoFormat("[SERVER]: Adding {0} from ./bin", a.Name); | 145 | m_log.InfoFormat("[SERVER UTILS]: Adding {0} from ./bin", a.Name); |
146 | connector.PluginPath = a.AddinFile; | 146 | connector.PluginPath = a.AddinFile; |
147 | } | 147 | } |
148 | LoadPlugin(connector); | 148 | LoadPlugin(connector); |
149 | break; | 149 | break; |
150 | case ExtensionChange.Remove: | 150 | case ExtensionChange.Remove: |
151 | m_log.InfoFormat("[SERVER]: Removing {0}", a.Name); | 151 | m_log.InfoFormat("[SERVER UTILS]: Removing {0}", a.Name); |
152 | UnloadPlugin(connector); | 152 | UnloadPlugin(connector); |
153 | break; | 153 | break; |
154 | } | 154 | } |
@@ -166,13 +166,13 @@ namespace OpenSim.Server.Base | |||
166 | } | 166 | } |
167 | else | 167 | else |
168 | { | 168 | { |
169 | m_log.InfoFormat("[SERVER]: {0} Disabled.", connector.ConfigName); | 169 | m_log.InfoFormat("[SERVER UTILS]: {0} Disabled.", connector.ConfigName); |
170 | } | 170 | } |
171 | } | 171 | } |
172 | 172 | ||
173 | private void UnloadPlugin(IRobustConnector connector) | 173 | private void UnloadPlugin(IRobustConnector connector) |
174 | { | 174 | { |
175 | m_log.InfoFormat("[Server]: Unloading {0}", connector.ConfigName); | 175 | m_log.InfoFormat("[SERVER UTILS]: Unloading {0}", connector.ConfigName); |
176 | 176 | ||
177 | connector.Unload(); | 177 | connector.Unload(); |
178 | } | 178 | } |
@@ -280,7 +280,7 @@ namespace OpenSim.Server.Base | |||
280 | { | 280 | { |
281 | if (!(e is System.MissingMethodException)) | 281 | if (!(e is System.MissingMethodException)) |
282 | { | 282 | { |
283 | m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}, {3}", | 283 | m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}, {3}", |
284 | interfaceName, | 284 | interfaceName, |
285 | dllName, | 285 | dllName, |
286 | e.InnerException == null ? e.Message : e.InnerException.Message, | 286 | e.InnerException == null ? e.Message : e.InnerException.Message, |
@@ -298,14 +298,14 @@ namespace OpenSim.Server.Base | |||
298 | } | 298 | } |
299 | catch (ReflectionTypeLoadException rtle) | 299 | catch (ReflectionTypeLoadException rtle) |
300 | { | 300 | { |
301 | m_log.Error(string.Format("Error loading plugin from {0}:\n{1}", dllName, | 301 | m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin from {0}:\n{1}", dllName, |
302 | String.Join("\n", Array.ConvertAll(rtle.LoaderExceptions, e => e.ToString()))), | 302 | String.Join("\n", Array.ConvertAll(rtle.LoaderExceptions, e => e.ToString()))), |
303 | rtle); | 303 | rtle); |
304 | return null; | 304 | return null; |
305 | } | 305 | } |
306 | catch (Exception e) | 306 | catch (Exception e) |
307 | { | 307 | { |
308 | m_log.Error(string.Format("Error loading plugin from {0}", dllName), e); | 308 | m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin from {0}", dllName), e); |
309 | return null; | 309 | return null; |
310 | } | 310 | } |
311 | } | 311 | } |
@@ -517,7 +517,7 @@ namespace OpenSim.Server.Base | |||
517 | public static IConfigSource LoadInitialConfig(string url) | 517 | public static IConfigSource LoadInitialConfig(string url) |
518 | { | 518 | { |
519 | IConfigSource source = new XmlConfigSource(); | 519 | IConfigSource source = new XmlConfigSource(); |
520 | m_log.InfoFormat("[CONFIG]: {0} is a http:// URI, fetching ...", url); | 520 | m_log.InfoFormat("[SERVER UTILS]: {0} is a http:// URI, fetching ...", url); |
521 | 521 | ||
522 | // The ini file path is a http URI | 522 | // The ini file path is a http URI |
523 | // Try to read it | 523 | // Try to read it |
@@ -529,7 +529,7 @@ namespace OpenSim.Server.Base | |||
529 | } | 529 | } |
530 | catch (Exception e) | 530 | catch (Exception e) |
531 | { | 531 | { |
532 | m_log.FatalFormat("[CONFIG]: Exception reading config from URI {0}\n" + e.ToString(), url); | 532 | m_log.FatalFormat("[SERVER UTILS]: Exception reading config from URI {0}\n" + e.ToString(), url); |
533 | Environment.Exit(1); | 533 | Environment.Exit(1); |
534 | } | 534 | } |
535 | 535 | ||