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

* Replaced old logging mechanism with new shiny logging mechanism

Browse Source 
* Console, I bid thee farewall. Use "Log" now where console used to exist.
This commit is contained in:
Adam Frisby
2007-06-20 15:50:06 +00:00
parent 64ed1e1b3b
commit 29053589bf
30 changed files with 289 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,17 +66,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");
OpenSim.Framework.Console.MainLog.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");
OpenSim.Framework.Console.MainLog.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());
OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
if (!yapfile)
{
@@ -124,7 +124,7 @@ namespace OpenSim.GridInterfaces.Local
{
if (db != null)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Closing local asset server database");
db.Close();
}
}
@@ -168,7 +168,7 @@ namespace OpenSim.GridInterfaces.Local
try
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Setting up asset database");
AssetBase Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");

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

@@ -53,7 +53,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.MainLog.Instance.Verbose("Remote Asset Server class created");
}
public void SetReceiver(IAssetReceiver receiver)
@@ -98,7 +98,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.MainLog.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];