aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.GridServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenGridServices.GridServer')
-rw-r--r--OpenGridServices.GridServer/GridManager.cs16
-rw-r--r--OpenGridServices.GridServer/Main.cs12
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices.GridServer/GridManager.cs
index e41f3d5..02a6a50 100644
--- a/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices.GridServer/GridManager.cs
@@ -24,10 +24,10 @@ namespace OpenGridServices.GridServer
24 /// <param name="FileName">The filename to the grid server plugin DLL</param> 24 /// <param name="FileName">The filename to the grid server plugin DLL</param>
25 public void AddPlugin(string FileName) 25 public void AddPlugin(string FileName)
26 { 26 {
27 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Attempting to load " + FileName); 27 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Attempting to load " + FileName);
28 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 28 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
29 29
30 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 30 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
31 foreach (Type pluginType in pluginAssembly.GetTypes()) 31 foreach (Type pluginType in pluginAssembly.GetTypes())
32 { 32 {
33 if (!pluginType.IsAbstract) 33 if (!pluginType.IsAbstract)
@@ -39,7 +39,7 @@ namespace OpenGridServices.GridServer
39 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 39 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
40 plug.Initialise(); 40 plug.Initialise();
41 this._plugins.Add(plug.getName(), plug); 41 this._plugins.Add(plug.getName(), plug);
42 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Added IGridData Interface"); 42 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Added IGridData Interface");
43 } 43 }
44 44
45 typeInterface = null; 45 typeInterface = null;
@@ -63,7 +63,7 @@ namespace OpenGridServices.GridServer
63 } 63 }
64 catch (Exception e) 64 catch (Exception e)
65 { 65 {
66 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); 66 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
67 } 67 }
68 } 68 }
69 return null; 69 return null;
@@ -84,7 +84,7 @@ namespace OpenGridServices.GridServer
84 } 84 }
85 catch (Exception e) 85 catch (Exception e)
86 { 86 {
87 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); 87 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
88 } 88 }
89 } 89 }
90 return null; 90 return null;
@@ -321,17 +321,17 @@ namespace OpenGridServices.GridServer
321 321
322 try 322 try
323 { 323 {
324 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Attempting to add a new region to the grid - " + _plugins.Count + " storage provider(s) registered."); 324 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Attempting to add a new region to the grid - " + _plugins.Count + " storage provider(s) registered.");
325 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 325 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
326 { 326 {
327 try 327 try
328 { 328 {
329 kvp.Value.AddProfile(TheSim); 329 kvp.Value.AddProfile(TheSim);
330 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("New sim added to grid (" + TheSim.regionName + ")"); 330 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"New sim added to grid (" + TheSim.regionName + ")");
331 } 331 }
332 catch (Exception e) 332 catch (Exception e)
333 { 333 {
334 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); 334 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
335 } 335 }
336 } 336 }
337 return "OK"; 337 return "OK";
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index ba6c60d..532e15d 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -73,7 +73,7 @@ namespace OpenGridServices.GridServer
73 73
74 private void Work() 74 private void Work()
75 { 75 {
76 m_console.WriteLine("\nEnter help for a list of commands\n"); 76 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"\nEnter help for a list of commands\n");
77 77
78 while (true) 78 while (true)
79 { 79 {
@@ -91,16 +91,16 @@ namespace OpenGridServices.GridServer
91 91
92 public void Startup() 92 public void Startup()
93 { 93 {
94 m_console.WriteLine("Main.cs:Startup() - Loading configuration"); 94 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration");
95 Cfg = this.LoadConfigDll(this.ConfigDll); 95 Cfg = this.LoadConfigDll(this.ConfigDll);
96 Cfg.InitConfig(); 96 Cfg.InitConfig();
97 97
98 m_console.WriteLine("Main.cs:Startup() - Connecting to Storage Server"); 98 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Connecting to Storage Server");
99 m_gridManager = new GridManager(); 99 m_gridManager = new GridManager();
100 m_gridManager.AddPlugin(GridDll); // Made of win 100 m_gridManager.AddPlugin(GridDll); // Made of win
101 m_gridManager.defaultRecvKey = Cfg.SimRecvKey; 101 m_gridManager.defaultRecvKey = Cfg.SimRecvKey;
102 102
103 m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); 103 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
104 BaseHttpServer httpServer = new BaseHttpServer(8001); 104 BaseHttpServer httpServer = new BaseHttpServer(8001);
105 105
106 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod); 106 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod);
@@ -127,7 +127,7 @@ namespace OpenGridServices.GridServer
127 127
128 httpServer.Start(); 128 httpServer.Start();
129 129
130 m_console.WriteLine("Main.cs:Startup() - Starting sim status checker"); 130 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting sim status checker");
131 131
132 Timer simCheckTimer = new Timer( 300000 ); // 5 minutes 132 Timer simCheckTimer = new Timer( 300000 ); // 5 minutes
133 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); 133 simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);
@@ -204,7 +204,7 @@ namespace OpenGridServices.GridServer
204 switch (cmd) 204 switch (cmd)
205 { 205 {
206 case "help": 206 case "help":
207 m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)"); 207 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"shutdown - shutdown the grid (USE CAUTION!)");
208 break; 208 break;
209 209
210 case "shutdown": 210 case "shutdown":