From a9e9bc83ef5f0d36551eee420da6c71df48ad489 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 20 Jun 2007 15:52:45 +0000
Subject: * and done the same for OGS..
---
.../OpenGridServices.GridServer/GridManager.cs | 26 +++++++++++-----------
.../OpenGridServices.GridServer/Main.cs | 6 ++---
2 files changed, 16 insertions(+), 16 deletions(-)
(limited to 'OpenGridServices/OpenGridServices.GridServer')
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
/// The filename to the grid server plugin DLL
public void AddPlugin(string FileName)
{
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Attempting to load " + FileName);
+ OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+ OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (!pluginType.IsAbstract)
@@ -69,7 +69,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.Verbose("Storage: Added IGridData Interface");
+ OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface");
}
typeInterface = null;
@@ -82,7 +82,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.Verbose( "Storage: Added ILogData Interface");
+ OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface");
}
typeInterface = null;
@@ -110,7 +110,7 @@ namespace OpenGridServices.GridServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: unable to write log via " + kvp.Key);
+ OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
}
}
}
@@ -129,7 +129,7 @@ namespace OpenGridServices.GridServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
+ OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
}
}
return null;
@@ -150,7 +150,7 @@ namespace OpenGridServices.GridServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
+ OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
}
}
return null;
@@ -174,7 +174,7 @@ namespace OpenGridServices.GridServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
+ OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
}
}
@@ -362,7 +362,7 @@ namespace OpenGridServices.GridServer
simProfileList.Add(simProfileBlock);
}
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
+ OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");
}
else
{
@@ -388,7 +388,7 @@ namespace OpenGridServices.GridServer
}
}
}
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
+ OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");
}
responseData["sim-profiles"] = simProfileList;
@@ -549,18 +549,18 @@ namespace OpenGridServices.GridServer
try
{
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
+ OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");
foreach (KeyValuePair kvp in _plugins)
{
try
{
kvp.Value.AddProfile(TheSim);
- OpenSim.Framework.Console.MainConsole.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");
+ OpenSim.Framework.Console.MainLog.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.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());
+ OpenSim.Framework.Console.MainLog.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 37b9f7a..b948fd6 100644
--- a/OpenGridServices/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/Main.cs
@@ -63,7 +63,7 @@ namespace OpenGridServices.GridServer
private GridManager m_gridManager;
- private ConsoleBase m_console;
+ private LogBase m_console;
[STAThread]
public static void Main(string[] args)
@@ -91,8 +91,8 @@ namespace OpenGridServices.GridServer
private OpenGrid_Main()
{
- m_console = new ConsoleBase("opengrid-gridserver-console.log", "OpenGrid", this, false);
- MainConsole.Instance = m_console;
+ m_console = new LogBase("opengrid-gridserver-console.log", "OpenGrid", this, false);
+ MainLog.Instance = m_console;
}
--
cgit v1.1