diff options
author | John Hurliman | 2009-10-16 13:22:45 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-16 13:22:45 -0700 |
commit | e776dfb1d71ea7f8de37399f84fceb005870e861 (patch) | |
tree | 10774de398199b76e2ee13e391068315f072d12a | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into priorit... (diff) | |
download | opensim-SC-e776dfb1d71ea7f8de37399f84fceb005870e861.zip opensim-SC-e776dfb1d71ea7f8de37399f84fceb005870e861.tar.gz opensim-SC-e776dfb1d71ea7f8de37399f84fceb005870e861.tar.bz2 opensim-SC-e776dfb1d71ea7f8de37399f84fceb005870e861.tar.xz |
* Changing the "clean dropped attachments" MySQL command to a using statement inside a try/catch. This statement times out for me very frequently
* More verbose logging when zerocoding fails on an outbound packet
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 20 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 3 |
2 files changed, 16 insertions, 7 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 839ac7f..6bc8bec 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -68,12 +68,20 @@ namespace OpenSim.Data.MySQL | |||
68 | 68 | ||
69 | // Clean dropped attachments | 69 | // Clean dropped attachments |
70 | // | 70 | // |
71 | MySqlCommand cmd = m_Connection.CreateCommand(); | 71 | try |
72 | cmd.CommandText = "delete from prims, primshapes using prims " + | 72 | { |
73 | "left join primshapes on prims.uuid = primshapes.uuid " + | 73 | using (MySqlCommand cmd = m_Connection.CreateCommand()) |
74 | "where PCode = 9 and State <> 0"; | 74 | { |
75 | ExecuteNonQuery(cmd); | 75 | cmd.CommandText = "delete from prims, primshapes using prims " + |
76 | cmd.Dispose(); | 76 | "left join primshapes on prims.uuid = primshapes.uuid " + |
77 | "where PCode = 9 and State <> 0"; | ||
78 | ExecuteNonQuery(cmd); | ||
79 | } | ||
80 | } | ||
81 | catch (MySqlException ex) | ||
82 | { | ||
83 | m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message); | ||
84 | } | ||
77 | } | 85 | } |
78 | 86 | ||
79 | private IDataReader ExecuteReader(MySqlCommand c) | 87 | private IDataReader ExecuteReader(MySqlCommand c) |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index ee3e754..b11a80d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -285,7 +285,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
285 | // The packet grew larger than the bufferSize while zerocoding. | 285 | // The packet grew larger than the bufferSize while zerocoding. |
286 | // Remove the MSG_ZEROCODED flag and send the unencoded data | 286 | // Remove the MSG_ZEROCODED flag and send the unencoded data |
287 | // instead | 287 | // instead |
288 | m_log.Debug("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding for " + type + ". Removing MSG_ZEROCODED flag"); | 288 | m_log.Debug("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding for " + type + ". DataLength=" + dataLength + |
289 | " and BufferLength=" + buffer.Data.Length + ". Removing MSG_ZEROCODED flag"); | ||
289 | data[0] = (byte)(data[0] & ~Helpers.MSG_ZEROCODED); | 290 | data[0] = (byte)(data[0] & ~Helpers.MSG_ZEROCODED); |
290 | Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength); | 291 | Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength); |
291 | } | 292 | } |