diff options
Diffstat (limited to '')
-rw-r--r-- | OpenGridServices/OpenGridServices.GridServer/GridManager.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs index 6315a4a..81da18e 100644 --- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs +++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs | |||
@@ -26,10 +26,10 @@ namespace OpenGridServices.GridServer | |||
26 | /// <param name="FileName">The filename to the grid server plugin DLL</param> | 26 | /// <param name="FileName">The filename to the grid server plugin DLL</param> |
27 | public void AddPlugin(string FileName) | 27 | public void AddPlugin(string FileName) |
28 | { | 28 | { |
29 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Attempting to load " + FileName); | 29 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Attempting to load " + FileName); |
30 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 30 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
31 | 31 | ||
32 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); | 32 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); |
33 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 33 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
34 | { | 34 | { |
35 | if (!pluginType.IsAbstract) | 35 | if (!pluginType.IsAbstract) |
@@ -42,7 +42,7 @@ namespace OpenGridServices.GridServer | |||
42 | IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 42 | IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
43 | plug.Initialise(); | 43 | plug.Initialise(); |
44 | this._plugins.Add(plug.getName(), plug); | 44 | this._plugins.Add(plug.getName(), plug); |
45 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Added IGridData Interface"); | 45 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Added IGridData Interface"); |
46 | } | 46 | } |
47 | 47 | ||
48 | typeInterface = null; | 48 | typeInterface = null; |
@@ -55,7 +55,7 @@ namespace OpenGridServices.GridServer | |||
55 | ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 55 | ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
56 | plug.Initialise(); | 56 | plug.Initialise(); |
57 | this._logplugins.Add(plug.getName(), plug); | 57 | this._logplugins.Add(plug.getName(), plug); |
58 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Added ILogData Interface"); | 58 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Storage: Added ILogData Interface"); |
59 | } | 59 | } |
60 | 60 | ||
61 | typeInterface = null; | 61 | typeInterface = null; |
@@ -83,7 +83,7 @@ namespace OpenGridServices.GridServer | |||
83 | } | 83 | } |
84 | catch (Exception e) | 84 | catch (Exception e) |
85 | { | 85 | { |
86 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Storage: unable to write log via " + kvp.Key); | 86 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: unable to write log via " + kvp.Key); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | } | 89 | } |
@@ -102,7 +102,7 @@ namespace OpenGridServices.GridServer | |||
102 | } | 102 | } |
103 | catch (Exception e) | 103 | catch (Exception e) |
104 | { | 104 | { |
105 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); | 105 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); |
106 | } | 106 | } |
107 | } | 107 | } |
108 | return null; | 108 | return null; |
@@ -123,7 +123,7 @@ namespace OpenGridServices.GridServer | |||
123 | } | 123 | } |
124 | catch (Exception e) | 124 | catch (Exception e) |
125 | { | 125 | { |
126 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); | 126 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); |
127 | } | 127 | } |
128 | } | 128 | } |
129 | return null; | 129 | return null; |
@@ -147,7 +147,7 @@ namespace OpenGridServices.GridServer | |||
147 | } | 147 | } |
148 | catch (Exception e) | 148 | catch (Exception e) |
149 | { | 149 | { |
150 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Storage: Unable to query regionblock via " + kvp.Key); | 150 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); |
151 | } | 151 | } |
152 | } | 152 | } |
153 | 153 | ||
@@ -335,7 +335,7 @@ namespace OpenGridServices.GridServer | |||
335 | 335 | ||
336 | simProfileList.Add(simProfileBlock); | 336 | simProfileList.Add(simProfileBlock); |
337 | } | 337 | } |
338 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); | 338 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); |
339 | } | 339 | } |
340 | else | 340 | else |
341 | { | 341 | { |
@@ -361,7 +361,7 @@ namespace OpenGridServices.GridServer | |||
361 | } | 361 | } |
362 | } | 362 | } |
363 | } | 363 | } |
364 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); | 364 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); |
365 | } | 365 | } |
366 | 366 | ||
367 | responseData["sim-profiles"] = simProfileList; | 367 | responseData["sim-profiles"] = simProfileList; |
@@ -522,18 +522,18 @@ namespace OpenGridServices.GridServer | |||
522 | 522 | ||
523 | try | 523 | try |
524 | { | 524 | { |
525 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Updating / adding via " + _plugins.Count + " storage provider(s) registered."); | 525 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); |
526 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | 526 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) |
527 | { | 527 | { |
528 | try | 528 | try |
529 | { | 529 | { |
530 | kvp.Value.AddProfile(TheSim); | 530 | kvp.Value.AddProfile(TheSim); |
531 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"New sim added to grid (" + TheSim.regionName + ")"); | 531 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); |
532 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); | 532 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); |
533 | } | 533 | } |
534 | catch (Exception e) | 534 | catch (Exception e) |
535 | { | 535 | { |
536 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); | 536 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); |
537 | } | 537 | } |
538 | } | 538 | } |
539 | return "OK"; | 539 | return "OK"; |