ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Removed MainConsole.Instance.WriteLine completely

Browse Source 
* Now exists MainConsole.Instance.Error/Warn/Notice/Verbose -- use those instead
* Removed some instances of System.Console use - aiming to depreciate this in favour of MainConsole completely.
This commit is contained in:
Adam Frisby
2007-06-05 12:55:12 +00:00
parent 891b92a780
commit 1e716260c8
27 changed files with 221 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
View File

@@ -39,17 +39,17 @@ namespace OpenSim.GridInterfaces.Local
this._assetRequests = new BlockingQueue<ARequest>();
yapfile = System.IO.File.Exists("assets.yap");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Asset Server class created");
MainConsole.Instance.Verbose("Local Asset Server class created");
try
{
db = Db4oFactory.OpenFile("assets.yap");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Db4 Asset database creation");
MainConsole.Instance.Verbose("Db4 Asset database creation");
}
catch (Exception e)
{
db.Close();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());
MainConsole.Instance.Warn("Db4 Asset server :Constructor - Exception occured");
MainConsole.Instance.Warn(e.ToString());
}
if (!yapfile)
{
@@ -97,7 +97,7 @@ namespace OpenSim.GridInterfaces.Local
{
if (db != null)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database");
MainConsole.Instance.Verbose( "Closing local asset server database");
db.Close();
}
}
@@ -141,7 +141,7 @@ namespace OpenSim.GridInterfaces.Local
try
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database");
MainConsole.Instance.Verbose( "Setting up asset database");
AssetBase Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");

2
OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
View File

@@ -62,7 +62,7 @@ namespace OpenSim.GridInterfaces.Local
public LocalGridServer()
{
Sessions = new List<Login>();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Grid Server class created");
MainConsole.Instance.Verbose("Local Grid Server class created");
}
public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)

4
OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
View File

@@ -26,7 +26,7 @@ namespace OpenSim.GridInterfaces.Remote
this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
this._remoteAssetServerThread.IsBackground = true;
this._remoteAssetServerThread.Start();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Asset Server class created");
OpenSim.Framework.Console.MainConsole.Instance.Verbose("Remote Asset Server class created");
}
public void SetReceiver(IAssetReceiver receiver)
@@ -71,7 +71,7 @@ namespace OpenSim.GridInterfaces.Remote
// 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
ARequest req = this._assetRequests.Dequeue();
LLUUID assetID = req.AssetID;
// OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
// OpenSim.Framework.Console.MainConsole.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
WebResponse AssetResponse = AssetLoad.GetResponse();
byte[] idata = new byte[(int)AssetResponse.ContentLength];

7
OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
View File

@@ -35,6 +35,7 @@ using libsecondlife;
using Nwc.XmlRpc;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
namespace OpenSim.GridInterfaces.Remote
{
@@ -68,7 +69,7 @@ namespace OpenSim.GridInterfaces.Remote
public RemoteGridServer()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Remote Grid Server class created");
MainConsole.Instance.Notice("Remote Grid Server class created");
}
public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
@@ -89,8 +90,8 @@ namespace OpenSim.GridInterfaces.Remote
if (GridRespData.ContainsKey("error"))
{
string errorstring = (string)GridRespData["error"];
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Error connecting to grid:");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, errorstring);
MainConsole.Instance.Warn("Error connecting to grid:");
MainConsole.Instance.Warn(errorstring);
return false;
}
this.neighbours = (ArrayList)GridRespData["neighbours"];