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 10cbf82..8ae365f 100644 --- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs +++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs | |||
@@ -53,10 +53,10 @@ namespace OpenGridServices.GridServer | |||
53 | /// <param name="FileName">The filename to the grid server plugin DLL</param> | 53 | /// <param name="FileName">The filename to the grid server plugin DLL</param> |
54 | public void AddPlugin(string FileName) | 54 | public void AddPlugin(string FileName) |
55 | { | 55 | { |
56 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Attempting to load " + FileName); | 56 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName); |
57 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | 57 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); |
58 | 58 | ||
59 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); | 59 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); |
60 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 60 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
61 | { | 61 | { |
62 | if (!pluginType.IsAbstract) | 62 | if (!pluginType.IsAbstract) |
@@ -69,7 +69,7 @@ namespace OpenGridServices.GridServer | |||
69 | IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 69 | IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
70 | plug.Initialise(); | 70 | plug.Initialise(); |
71 | this._plugins.Add(plug.getName(), plug); | 71 | this._plugins.Add(plug.getName(), plug); |
72 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Added IGridData Interface"); | 72 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface"); |
73 | } | 73 | } |
74 | 74 | ||
75 | typeInterface = null; | 75 | typeInterface = null; |
@@ -82,7 +82,7 @@ namespace OpenGridServices.GridServer | |||
82 | ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 82 | ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
83 | plug.Initialise(); | 83 | plug.Initialise(); |
84 | this._logplugins.Add(plug.getName(), plug); | 84 | this._logplugins.Add(plug.getName(), plug); |
85 | OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Storage: Added ILogData Interface"); | 85 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface"); |
86 | } | 86 | } |
87 | 87 | ||
88 | typeInterface = null; | 88 | typeInterface = null; |
@@ -110,7 +110,7 @@ namespace OpenGridServices.GridServer | |||
110 | } | 110 | } |
111 | catch (Exception e) | 111 | catch (Exception e) |
112 | { | 112 | { |
113 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: unable to write log via " + kvp.Key); | 113 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); |
114 | } | 114 | } |
115 | } | 115 | } |
116 | } | 116 | } |
@@ -129,7 +129,7 @@ namespace OpenGridServices.GridServer | |||
129 | } | 129 | } |
130 | catch (Exception e) | 130 | catch (Exception e) |
131 | { | 131 | { |
132 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); | 132 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); |
133 | } | 133 | } |
134 | } | 134 | } |
135 | return null; | 135 | return null; |
@@ -150,7 +150,7 @@ namespace OpenGridServices.GridServer | |||
150 | } | 150 | } |
151 | catch (Exception e) | 151 | catch (Exception e) |
152 | { | 152 | { |
153 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); | 153 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); |
154 | } | 154 | } |
155 | } | 155 | } |
156 | return null; | 156 | return null; |
@@ -174,7 +174,7 @@ namespace OpenGridServices.GridServer | |||
174 | } | 174 | } |
175 | catch (Exception e) | 175 | catch (Exception e) |
176 | { | 176 | { |
177 | OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); | 177 | OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
@@ -362,7 +362,7 @@ namespace OpenGridServices.GridServer | |||
362 | 362 | ||
363 | simProfileList.Add(simProfileBlock); | 363 | simProfileList.Add(simProfileBlock); |
364 | } | 364 | } |
365 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); | 365 | OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); |
366 | } | 366 | } |
367 | else | 367 | else |
368 | { | 368 | { |
@@ -388,7 +388,7 @@ namespace OpenGridServices.GridServer | |||
388 | } | 388 | } |
389 | } | 389 | } |
390 | } | 390 | } |
391 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); | 391 | OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); |
392 | } | 392 | } |
393 | 393 | ||
394 | responseData["sim-profiles"] = simProfileList; | 394 | responseData["sim-profiles"] = simProfileList; |
@@ -549,18 +549,18 @@ namespace OpenGridServices.GridServer | |||
549 | 549 | ||
550 | try | 550 | try |
551 | { | 551 | { |
552 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); | 552 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); |
553 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | 553 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) |
554 | { | 554 | { |
555 | try | 555 | try |
556 | { | 556 | { |
557 | kvp.Value.AddProfile(TheSim); | 557 | kvp.Value.AddProfile(TheSim); |
558 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); | 558 | OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")"); |
559 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); | 559 | logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid."); |
560 | } | 560 | } |
561 | catch (Exception e) | 561 | catch (Exception e) |
562 | { | 562 | { |
563 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); | 563 | OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); |
564 | } | 564 | } |
565 | } | 565 | } |
566 | return "OK"; | 566 | return "OK"; |