From 038774de30ce26120c91ccd8e1cda1b2a89e1841 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sun, 29 Jul 2007 09:37:29 +0000 Subject: Commit 1/2 * DB4o no longer crashes the sim on Startup * DB4o now crashes the sim on shutdown. * Variety of console verbosity fixes. --- OpenSim/Region/Application/OpenSimMain.cs | 8 ++++---- OpenSim/Region/ClientStack/RegionApplicationBase.cs | 4 ++-- OpenSim/Region/ClientStack/UDPServer.cs | 8 ++++---- OpenSim/Region/Environment/Scenes/Primitive.cs | 3 ++- OpenSim/Region/Environment/StorageManager.cs | 3 +++ OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs | 10 ++++++++-- 6 files changed, 23 insertions(+), 13 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 476f9bc..c00dfdf 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -306,11 +306,11 @@ namespace OpenSim /// public virtual void Shutdown() { - m_log.Verbose("Main.cs:Shutdown() - Closing all threads"); - m_log.Verbose("Main.cs:Shutdown() - Killing listener thread"); - m_log.Verbose("Main.cs:Shutdown() - Killing clients"); + m_log.Verbose("Closing all threads"); + m_log.Verbose("Killing listener thread"); + m_log.Verbose("Killing clients"); // IMPLEMENT THIS - m_log.Verbose("Main.cs:Shutdown() - Closing console and terminating"); + m_log.Verbose("Closing console and terminating"); for (int i = 0; i < m_localScenes.Count; i++) { ((Scene)m_localScenes[i]).Close(); diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index a61b9e3..bad7fec 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -120,13 +120,13 @@ namespace OpenSim.Region.ClientStack UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); if (masterAvatar != null) { - m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); + m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; //TODO: Load parcels from storageManager } else { - m_log.Notice("Parcels - No master avatar found, using null."); + m_log.Verbose("PARCEL", "No master avatar found, using null."); scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; //TODO: Load parcels from storageManager } diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 705ced0..1e1801f 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs @@ -122,7 +122,7 @@ namespace OpenSim.Region.ClientStack } else { // invalid client - m_log.Warn("client", "UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString()); + m_log.Warn("client", "Got a packet from an invalid client - " + epSender.ToString()); } Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); @@ -138,20 +138,20 @@ namespace OpenSim.Region.ClientStack public void ServerListener() { - m_log.Status("SERVER", "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); + m_log.Verbose("SERVER", "Opening UDP socket on " + listenPort); ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); Server.Bind(ServerIncoming); - m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); + m_log.Verbose("SERVER", "UDP socket bound, getting ready to listen"); ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); epSender = (EndPoint)ipeSender; ReceivedData = new AsyncCallback(this.OnReceivedData); Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); - m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - Listening..."); + m_log.Status("SERVER", "Listening..."); } diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs index ce5c327..5f5113d 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive.cs +++ b/OpenSim/Region/Environment/Scenes/Primitive.cs @@ -171,7 +171,8 @@ namespace OpenSim.Region.Environment.Scenes ~Primitive() { - OnPrimCountTainted(); + if (OnPrimCountTainted != null) + OnPrimCountTainted(); } #endregion diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs index fb12c4d..a7d67d3 100644 --- a/OpenSim/Region/Environment/StorageManager.cs +++ b/OpenSim/Region/Environment/StorageManager.cs @@ -32,6 +32,7 @@ namespace OpenSim.Region.Environment public StorageManager(string dllName, string dataStoreFile, string dataStoreDB) { + OpenSim.Framework.Console.MainLog.Instance.Verbose("DATASTORE", "Attempting to load " + dllName); Assembly pluginAssembly = Assembly.LoadFrom(dllName); foreach (Type pluginType in pluginAssembly.GetTypes()) @@ -46,6 +47,8 @@ namespace OpenSim.Region.Environment plug.Initialise(dataStoreFile, dataStoreDB); m_dataStore = plug; + + OpenSim.Framework.Console.MainLog.Instance.Verbose("DATASTORE", "Added IRegionDataStore Interface"); } typeInterface = null; diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs index 25a12a4..91dab04 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs @@ -37,6 +37,7 @@ namespace OpenSim.DataStore.DB4oStorage public void Initialise(string dbfile, string dbname) { + MainLog.Instance.Verbose("DATASTORE", "DB4O - Opening " + dbfile); db = Db4oFactory.OpenFile(dbfile); return; @@ -62,6 +63,8 @@ namespace OpenSim.DataStore.DB4oStorage IObjectSet result = db.Get(typeof(SceneObject)); List retvals = new List(); + MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects"); + foreach (Object obj in result) { retvals.Add((SceneObject)obj); @@ -97,8 +100,11 @@ namespace OpenSim.DataStore.DB4oStorage public void Shutdown() { - db.Commit(); - db.Close(); + if (db != null) + { + db.Commit(); + db.Close(); + } } } } -- cgit v1.1