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

Add undocumented RemoteRequestTimeout seconds parameter to xinventory requests 

This is for testing purposes (chiefly http://opensimulator.org/mantis/view.php?id=7054) so many not be permanent
Setting this will change the xinventory request timeout from the simulator from the default 100 seconds
bullet-2.82
Justin Clark-Casey (justincc) 2014-07-25 23:06:23 +01:00
parent 8c5c9806d7
commit c0c92a95bf
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
View File

@ -48,6 +48,14 @@ namespace OpenSim.Services.Connectors
private string m_ServerURI = String.Empty; private string m_ServerURI = String.Empty;
/// <summary>
/// Timeout for remote requests.
/// </summary>
/// <remarks>
/// In this case, -1 is default timeout (100 seconds), not infinite.
/// </remarks>
private int m_requestTimeoutSecs = -1;
private object m_Lock = new object(); private object m_Lock = new object();
public XInventoryServicesConnector() public XInventoryServicesConnector()
@ -67,14 +75,14 @@ namespace OpenSim.Services.Connectors
public virtual void Initialise(IConfigSource source) public virtual void Initialise(IConfigSource source)
{ {
IConfig assetConfig = source.Configs["InventoryService"]; IConfig config = source.Configs["InventoryService"];
if (assetConfig == null) if (config == null)
{ {
m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
throw new Exception("Inventory connector init error"); throw new Exception("Inventory connector init error");
} }
string serviceURI = assetConfig.GetString("InventoryServerURI", string serviceURI = config.GetString("InventoryServerURI",
String.Empty); String.Empty);
if (serviceURI == String.Empty) if (serviceURI == String.Empty)
@ -83,6 +91,8 @@ namespace OpenSim.Services.Connectors
throw new Exception("Inventory connector init error"); throw new Exception("Inventory connector init error");
} }
m_ServerURI = serviceURI; m_ServerURI = serviceURI;
m_requestTimeoutSecs = config.GetInt("RemoteRequestTimeout", m_requestTimeoutSecs);
} }
private bool CheckReturn(Dictionary<string, object> ret) private bool CheckReturn(Dictionary<string, object> ret)
@ -506,7 +516,7 @@ namespace OpenSim.Services.Connectors
lock (m_Lock) lock (m_Lock)
reply = SynchronousRestFormsRequester.MakeRequest("POST", reply = SynchronousRestFormsRequester.MakeRequest("POST",
m_ServerURI + "/xinventory", m_ServerURI + "/xinventory",
ServerUtils.BuildQueryString(sendData), m_Auth); ServerUtils.BuildQueryString(sendData), m_requestTimeoutSecs, m_Auth);
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
reply); reply);