OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
prioritization
John Hurliman 2009-10-16 13:22:45 -07:00
parent eee1318597
commit e776dfb1d7
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
View File

@ -68,12 +68,20 @@ namespace OpenSim.Data.MySQL
// Clean dropped attachments // Clean dropped attachments
// //
MySqlCommand cmd = m_Connection.CreateCommand(); try
cmd.CommandText = "delete from prims, primshapes using prims " + {
"left join primshapes on prims.uuid = primshapes.uuid " + using (MySqlCommand cmd = m_Connection.CreateCommand())
"where PCode = 9 and State <> 0"; {
ExecuteNonQuery(cmd); cmd.CommandText = "delete from prims, primshapes using prims " +
cmd.Dispose(); "left join primshapes on prims.uuid = primshapes.uuid " +
"where PCode = 9 and State <> 0";
ExecuteNonQuery(cmd);
}
}
catch (MySqlException ex)
{
m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message);
}
} }
private IDataReader ExecuteReader(MySqlCommand c) private IDataReader ExecuteReader(MySqlCommand c)

3
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -285,7 +285,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// The packet grew larger than the bufferSize while zerocoding. // The packet grew larger than the bufferSize while zerocoding.
// Remove the MSG_ZEROCODED flag and send the unencoded data // Remove the MSG_ZEROCODED flag and send the unencoded data
// instead // instead
m_log.Debug("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding for " + type + ". Removing MSG_ZEROCODED flag"); m_log.Debug("[LLUDPSERVER]: Packet exceeded buffer size during zerocoding for " + type + ". DataLength=" + dataLength +
" and BufferLength=" + buffer.Data.Length + ". Removing MSG_ZEROCODED flag");
data[0] = (byte)(data[0] & ~Helpers.MSG_ZEROCODED); data[0] = (byte)(data[0] & ~Helpers.MSG_ZEROCODED);
Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength); Buffer.BlockCopy(data, 0, buffer.Data, 0, dataLength);
} }