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

Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because it was _way_ too low and is probably making writes abort in the middle.

bulletsim
Diva Canto 2011-04-30 17:40:21 -07:00
parent 56df746133
commit 91a604d4b6
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/ChildAgentDataUpdate.cs
View File

@ -454,7 +454,6 @@ namespace OpenSim.Framework
{ {
OSDMap info = new OSDMap(4); OSDMap info = new OSDMap(4);
info["sog"] = OSD.FromString(so.ToXml2()); info["sog"] = OSD.FromString(so.ToXml2());
m_log.DebugFormat("[XXX] {0}", so.ToXml2());
info["extra"] = OSD.FromString(so.ExtraToXmlString()); info["extra"] = OSD.FromString(so.ExtraToXmlString());
info["modified"] = OSD.FromBoolean(so.HasGroupChanged); info["modified"] = OSD.FromBoolean(so.HasGroupChanged);
try try

15
OpenSim/Framework/WebUtil.cs
View File

@ -171,24 +171,15 @@ namespace OpenSim.Framework
request.Timeout = timeout; request.Timeout = timeout;
request.KeepAlive = false; request.KeepAlive = false;
request.MaximumAutomaticRedirections = 10; request.MaximumAutomaticRedirections = 10;
request.ReadWriteTimeout = timeout / 4; request.ReadWriteTimeout = timeout * 8;
request.Headers[OSHeaderRequestID] = reqnum.ToString(); request.Headers[OSHeaderRequestID] = reqnum.ToString();
// If there is some input, write it into the request // If there is some input, write it into the request
if (data != null) if (data != null)
{ {
string strBuffer = string.Empty; string strBuffer = OSDParser.SerializeJsonString(data);
try
{
strBuffer = OSDParser.SerializeJsonString(data);
}
catch (Exception e)
{
m_log.DebugFormat("[WEB UTIL]: Exception serializing data {0}", e.Message);
throw e;
}
byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
request.ContentType = "application/json"; request.ContentType = "application/json";
request.ContentLength = buffer.Length; //Count bytes to send request.ContentLength = buffer.Length; //Count bytes to send
using (Stream requestStream = request.GetRequestStream()) using (Stream requestStream = request.GetRequestStream())