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

Commit 1/2

Browse Source 
* DB4o no longer crashes the sim on Startup
* DB4o now crashes the sim on shutdown.
* Variety of console verbosity fixes.
This commit is contained in:
Adam Frisby
2007-07-29 09:37:29 +00:00
parent c518a9e141
commit 038774de30
10 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -306,11 +306,11 @@ namespace OpenSim
/// </summary>
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();

4
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@@ -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
}

8
OpenSim/Region/ClientStack/UDPServer.cs
View File

@@ -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...");
}

3
OpenSim/Region/Environment/Scenes/Primitive.cs
View File

@@ -171,7 +171,8 @@ namespace OpenSim.Region.Environment.Scenes
~Primitive()
{
OnPrimCountTainted();
if (OnPrimCountTainted != null)
OnPrimCountTainted();
}
#endregion

3
OpenSim/Region/Environment/StorageManager.cs
View File

@@ -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;

10
OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
View File

@@ -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<SceneObject> retvals = new List<SceneObject>();
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();
}
}
}
}