* Fixed OGS build

* Converted to new console interfaces
* Fixed other minor issues which somehow snuck in

2 files changed, 19 insertions, 19 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
         /// <param name="FileName">The filename to the grid server plugin DLL</param>

         public void AddPlugin(string FileName)

                 {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Attempting to load " + FileName);

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Attempting to load " + FileName);

                         Assembly pluginAssembly = Assembly.LoadFrom(FileName);

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

                         foreach (Type pluginType in pluginAssembly.GetTypes())

                         {

                 if (!pluginType.IsAbstract)

@@ -42,7 +42,7 @@ namespace OpenGridServices.GridServer
                         IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

                         plug.Initialise();

                         this._plugins.Add(plug.getName(), plug);

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Storage: Added IGridData Interface");

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Added IGridData Interface");

                     }

 

                     typeInterface = null;

@@ -55,7 +55,7 @@ namespace OpenGridServices.GridServer
                         ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

                         plug.Initialise();

                         this._logplugins.Add(plug.getName(), plug);

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Storage: Added ILogData Interface");

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Storage: Added ILogData Interface");

                     }

 

                     typeInterface = null;

@@ -83,7 +83,7 @@ namespace OpenGridServices.GridServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Storage: unable to write log via " + kvp.Key);

+                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: unable to write log via " + kvp.Key);

                 }

             }

         }

@@ -102,7 +102,7 @@ namespace OpenGridServices.GridServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);

+                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);

                 }

             }

             return null;

@@ -123,7 +123,7 @@ namespace OpenGridServices.GridServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);

+                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);

                 }

             }

             return null;

@@ -147,7 +147,7 @@ namespace OpenGridServices.GridServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Storage: Unable to query regionblock via " + kvp.Key);

+                    OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);

                 }

             }

 

@@ -335,7 +335,7 @@ namespace OpenGridServices.GridServer
 

                     simProfileList.Add(simProfileBlock);

                 }

-                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");

+                OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");

             }

             else

             {

@@ -361,7 +361,7 @@ namespace OpenGridServices.GridServer
                         }

                     }

                 }

-                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");

+                OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");

             }

 

             responseData["sim-profiles"] = simProfileList;

@@ -522,18 +522,18 @@ namespace OpenGridServices.GridServer
 

             try

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Updating / adding via " + _plugins.Count + " storage provider(s) registered.");

+                OpenSim.Framework.Console.MainConsole.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");

                 foreach (KeyValuePair<string, IGridData> kvp in _plugins)

                 {

                     try

                     {

                         kvp.Value.AddProfile(TheSim);

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"New sim added to grid (" + TheSim.regionName + ")");

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");

                         logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");

                     }

                     catch (Exception e)

                     {

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());

                     }

                 }

                 return "OK";

diff --git a/OpenGridServices/OpenGridServices.GridServer/Main.cs b/OpenGridServices/OpenGridServices.GridServer/Main.cs
index 71f878a..9aabae1 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/Main.cs
@@ -116,17 +116,17 @@ namespace OpenGridServices.GridServer
             this.ConfigDB(this.localXMLConfig);

             this.localXMLConfig.Close();

 

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration");

+            m_console.Verbose( "Main.cs:Startup() - Loading configuration");

             Cfg = this.LoadConfigDll(this.ConfigDll);

             Cfg.InitConfig();

             if (setuponly) Environment.Exit(0);

 

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Connecting to Storage Server");

+            m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");

             m_gridManager = new GridManager();

             m_gridManager.AddPlugin(GridDll); // Made of win

             m_gridManager.config = Cfg;

 

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP process");

+            m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");

             BaseHttpServer httpServer = new BaseHttpServer(8001);

             //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);

 

@@ -143,7 +143,7 @@ namespace OpenGridServices.GridServer
             // I have no idea what this was supposed to do - looks like an infinite recursion to me.

             //        case "regions":

             //// DIRTY HACK ALERT

-            //Console.WriteLine("/regions/ accessed");

+            //Console.Notice("/regions/ accessed");

             //TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));

             //respstring = ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);

             //break;

@@ -155,7 +155,7 @@ namespace OpenGridServices.GridServer
 

             httpServer.Start();

 

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting sim status checker");

+            m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");

 

             System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates.

             simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);

@@ -232,7 +232,7 @@ namespace OpenGridServices.GridServer
             switch (cmd)

             {

                 case "help":

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown the grid (USE CAUTION!)");

+                    m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");

                     break;

 

                 case "shutdown":