From e7c877407f2a72a9519eb53debca5aeef20cded9 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Tue, 6 Oct 2009 02:38:00 -0700 Subject: * Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet * Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing * Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively * Fixed formatting for a MySQLAssetData error logging line --- OpenSim/Data/MySQL/MySQLAssetData.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 8f97440..259e186 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -239,10 +239,8 @@ namespace OpenSim.Data.MySQL } catch (Exception e) { - m_log.ErrorFormat( - "[ASSETS DB]: " + - "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() - + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name); + m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Attempting reconnect. Error: {2}", + asset.FullID, asset.Name, e.Message); _dbConnection.Reconnect(); } } -- cgit v1.1 From a3a8691ebecf3a029e0e897786fde5051d3d6097 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Tue, 6 Oct 2009 14:18:37 -0700 Subject: MySQLLegacyRegionData: Extreme Spam Edition(tm) --- OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index fe0914b..d99bc30 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs @@ -402,8 +402,12 @@ namespace OpenSim.Data.MySQL Dictionary prims = new Dictionary(); SceneObjectGroup grp = null; + m_log.Debug("[REGION DB]: Entering LoadObjects()"); + lock (m_Connection) { + m_log.Debug("[REGION DB]: Entered LoadObjects() lock"); + using (MySqlCommand cmd = m_Connection.CreateCommand()) { cmd.CommandText = "select *, " + @@ -419,6 +423,8 @@ namespace OpenSim.Data.MySQL { while (reader.Read()) { + m_log.Debug("[REGION DB]: LoadObjects() Read a prim"); + SceneObjectPart prim = BuildPrim(reader); if (reader["Shape"] is DBNull) prim.Shape = PrimitiveBaseShape.Default; -- cgit v1.1 From c8558065484bfc3758804c6140ce88ad2c5aed37 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Tue, 6 Oct 2009 14:26:00 -0700 Subject: Reverting MySQLLegacyRegionData spam --- OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 6 ------ 1 file changed, 6 deletions(-) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index d99bc30..fe0914b 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs @@ -402,12 +402,8 @@ namespace OpenSim.Data.MySQL Dictionary prims = new Dictionary(); SceneObjectGroup grp = null; - m_log.Debug("[REGION DB]: Entering LoadObjects()"); - lock (m_Connection) { - m_log.Debug("[REGION DB]: Entered LoadObjects() lock"); - using (MySqlCommand cmd = m_Connection.CreateCommand()) { cmd.CommandText = "select *, " + @@ -423,8 +419,6 @@ namespace OpenSim.Data.MySQL { while (reader.Read()) { - m_log.Debug("[REGION DB]: LoadObjects() Read a prim"); - SceneObjectPart prim = BuildPrim(reader); if (reader["Shape"] is DBNull) prim.Shape = PrimitiveBaseShape.Default; -- cgit v1.1