From 6ed5283bc06a62f38eb517e67b975832b603bf61 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 5 Feb 2008 19:44:27 +0000 Subject: Converted logging to use log4net. Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done. --- .../Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs') diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs index 5125709..992f931 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs @@ -42,9 +42,10 @@ using Db4objects.Db4o.Query; namespace OpenSim.DataStore.DB4oStorage { - public class SceneObjectQuery : Predicate { + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private LLUUID globalIDSearch; public SceneObjectQuery(LLUUID find) @@ -58,17 +59,14 @@ namespace OpenSim.DataStore.DB4oStorage } } - public class DB4oDataStore : IRegionDataStore { private IObjectContainer db; public void Initialise(string dbfile, string dbname) { - MainLog.Instance.Verbose("DATASTORE", "DB4O - Opening " + dbfile); + m_log.Info("[DATASTORE]: DB4O - Opening " + dbfile); db = Db4oFactory.OpenFile(dbfile); - - return; } public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) @@ -91,7 +89,7 @@ namespace OpenSim.DataStore.DB4oStorage IObjectSet result = db.Get(typeof(SceneObjectGroup)); List retvals = new List(); - MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects"); + m_log.Info("[DATASTORE]: DB4O - LoadObjects found " + result.Count.ToString() + " objects"); foreach (Object obj in result) { @@ -103,7 +101,6 @@ namespace OpenSim.DataStore.DB4oStorage public void StoreTerrain(double[,] ter) { - } public double[,] LoadTerrain() @@ -113,12 +110,10 @@ namespace OpenSim.DataStore.DB4oStorage public void RemoveLandObject(uint id) { - } public void StoreParcel(Land parcel) { - } public List LoadLandObjects() -- cgit v1.1