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

Changed HG status notifications timeout down to 15secs from the default 100.

cpu-performance
Diva Canto 2013-06-29 18:35:23 -07:00
parent 3a634c56e3
commit 00093a305d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/WebUtil.cs
View File

@ -962,11 +962,12 @@ namespace OpenSim.Framework
/// <param name="verb"></param> /// <param name="verb"></param>
/// <param name="requestUrl"></param> /// <param name="requestUrl"></param>
/// <param name="obj"> </param> /// <param name="obj"> </param>
/// <param name="timeoutsecs"> </param>
/// <returns></returns> /// <returns></returns>
/// ///
/// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
/// the request. You'll want to make sure you deal with this as they're not uncommon</exception> /// the request. You'll want to make sure you deal with this as they're not uncommon</exception>
public static string MakeRequest(string verb, string requestUrl, string obj) public static string MakeRequest(string verb, string requestUrl, string obj, int timeoutsecs)
{ {
int reqnum = WebUtil.RequestNumber++; int reqnum = WebUtil.RequestNumber++;
@ -980,6 +981,8 @@ namespace OpenSim.Framework
WebRequest request = WebRequest.Create(requestUrl); WebRequest request = WebRequest.Create(requestUrl);
request.Method = verb; request.Method = verb;
if (timeoutsecs > 0)
request.Timeout = timeoutsecs * 1000;
string respstring = String.Empty; string respstring = String.Empty;
using (MemoryStream buffer = new MemoryStream()) using (MemoryStream buffer = new MemoryStream())
@ -1073,6 +1076,11 @@ namespace OpenSim.Framework
return respstring; return respstring;
} }
public static string MakeRequest(string verb, string requestUrl, string obj)
{
return MakeRequest(verb, requestUrl, obj, -1);
}
} }
public class SynchronousRestObjectRequester public class SynchronousRestObjectRequester

2
OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
View File

@ -277,7 +277,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
{ {
reply = SynchronousRestFormsRequester.MakeRequest("POST", reply = SynchronousRestFormsRequester.MakeRequest("POST",
uri, uri,
ServerUtils.BuildQueryString(sendData)); ServerUtils.BuildQueryString(sendData), 15);
} }
catch (Exception e) catch (Exception e)
{ {