diff options
| author | Melanie Thielker | 2008-08-08 13:46:24 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-08-08 13:46:24 +0000 |
| commit | 2248ad2ed2146e3b2c8924839aa4af22cb8957b3 (patch) | |
| tree | f9f041efa2f6040903de142634f2937ca38d0599 | |
| parent | Sorry, thoughtI had added that :/ (diff) | |
| download | opensim-SC_OLD-2248ad2ed2146e3b2c8924839aa4af22cb8957b3.zip opensim-SC_OLD-2248ad2ed2146e3b2c8924839aa4af22cb8957b3.tar.gz opensim-SC_OLD-2248ad2ed2146e3b2c8924839aa4af22cb8957b3.tar.bz2 opensim-SC_OLD-2248ad2ed2146e3b2c8924839aa4af22cb8957b3.tar.xz | |
Patch #9161
Increase GetUserProfile timeout from 6 to 30 seconds. Because
the worker thread fo the XMLRPC data pump sits on a lock
while the system starts, regions with upwards of 6000 prims
throw and exception when that thread gets blocked for more
than 6 seconds, due to this timeout, and won't start.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 015d761..c6f905f 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
| @@ -339,7 +339,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
| 339 | IList parameters = new ArrayList(); | 339 | IList parameters = new ArrayList(); |
| 340 | parameters.Add(param); | 340 | parameters.Add(param); |
| 341 | XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters); | 341 | XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters); |
| 342 | XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 6000); | 342 | XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 30000); |
| 343 | Hashtable respData = (Hashtable) resp.Value; | 343 | Hashtable respData = (Hashtable) resp.Value; |
| 344 | 344 | ||
| 345 | return ConvertXMLRPCDataToUserProfile(respData); | 345 | return ConvertXMLRPCDataToUserProfile(respData); |
| @@ -368,7 +368,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
| 368 | IList parameters = new ArrayList(); | 368 | IList parameters = new ArrayList(); |
| 369 | parameters.Add(param); | 369 | parameters.Add(param); |
| 370 | XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters); | 370 | XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters); |
| 371 | XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 6000); | 371 | XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 30000); |
| 372 | Hashtable respData = (Hashtable) resp.Value; | 372 | Hashtable respData = (Hashtable) resp.Value; |
| 373 | 373 | ||
| 374 | return ConvertXMLRPCDataToUserProfile(respData); | 374 | return ConvertXMLRPCDataToUserProfile(respData); |