aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-05-02 11:56:51 -0700
committerDiva Canto2011-05-02 11:56:51 -0700
commit2d403d5b187c9598b61f24055442cf7467e2b734 (patch)
treefe0ea9137a365a2c8fbb7237d449898f58899702
parentRefactored the GetMesh module into a handler and a module, to be the same as ... (diff)
parentIncreased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
downloadopensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.zip
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.gz
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.bz2
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.xz
Merge branch 'master' into caps
-rw-r--r--OpenSim/Framework/WebUtil.cs18
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs14
3 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index ac0828b..4734fc1 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -140,19 +140,19 @@ namespace OpenSim.Framework
140 /// PUT JSON-encoded data to a web service that returns LLSD or 140 /// PUT JSON-encoded data to a web service that returns LLSD or
141 /// JSON data 141 /// JSON data
142 /// </summary> 142 /// </summary>
143 public static OSDMap PutToService(string url, OSDMap data) 143 public static OSDMap PutToService(string url, OSDMap data, int timeout)
144 { 144 {
145 return ServiceOSDRequest(url,data,"PUT",30000); 145 return ServiceOSDRequest(url,data, "PUT", timeout);
146 } 146 }
147 147
148 public static OSDMap PostToService(string url, OSDMap data) 148 public static OSDMap PostToService(string url, OSDMap data, int timeout)
149 { 149 {
150 return ServiceOSDRequest(url,data,"POST",30000); 150 return ServiceOSDRequest(url, data, "POST", timeout);
151 } 151 }
152 152
153 public static OSDMap GetFromService(string url) 153 public static OSDMap GetFromService(string url, int timeout)
154 { 154 {
155 return ServiceOSDRequest(url,null,"GET",30000); 155 return ServiceOSDRequest(url, null, "GET", timeout);
156 } 156 }
157 157
158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) 158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -171,7 +171,7 @@ namespace OpenSim.Framework
171 request.Timeout = timeout; 171 request.Timeout = timeout;
172 request.KeepAlive = false; 172 request.KeepAlive = false;
173 request.MaximumAutomaticRedirections = 10; 173 request.MaximumAutomaticRedirections = 10;
174 request.ReadWriteTimeout = timeout * 8; 174 request.ReadWriteTimeout = timeout / 4;
175 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 175 request.Headers[OSHeaderRequestID] = reqnum.ToString();
176 176
177 // If there is some input, write it into the request 177 // If there is some input, write it into the request
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 8ab323a..0430ef6 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
314 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 314 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
315 args["teleport_flags"] = OSD.FromString(flags.ToString()); 315 args["teleport_flags"] = OSD.FromString(flags.ToString());
316 316
317 OSDMap result = WebUtil.PostToService(uri,args); 317 OSDMap result = WebUtil.PostToService(uri, args, 20000);
318 if (result["Success"].AsBoolean()) 318 if (result["Success"].AsBoolean())
319 { 319 {
320 OSDMap unpacked = (OSDMap)result["_Result"]; 320 OSDMap unpacked = (OSDMap)result["_Result"];
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 5cb8269..cef6473 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Services.Connectors.Simulation
102 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 102 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
103 args["teleport_flags"] = OSD.FromString(flags.ToString()); 103 args["teleport_flags"] = OSD.FromString(flags.ToString());
104 104
105 OSDMap result = WebUtil.PostToService(uri,args); 105 OSDMap result = WebUtil.PostToService(uri, args, 20000);
106 if (result["Success"].AsBoolean()) 106 if (result["Success"].AsBoolean())
107 return true; 107 return true;
108 108
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Connectors.Simulation
126 /// </summary> 126 /// </summary>
127 public bool UpdateAgent(GridRegion destination, AgentData data) 127 public bool UpdateAgent(GridRegion destination, AgentData data)
128 { 128 {
129 return UpdateAgent(destination, (IAgentData)data); 129 return UpdateAgent(destination, (IAgentData)data, 200000); // yes, 200 seconds
130 } 130 }
131 131
132 /// <summary> 132 /// <summary>
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.Simulation
181 } 181 }
182 } 182 }
183 183
184 UpdateAgent(destination,(IAgentData)pos); 184 UpdateAgent(destination, (IAgentData)pos, 10000);
185 } 185 }
186 186
187 // unreachable 187 // unreachable
@@ -191,7 +191,7 @@ namespace OpenSim.Services.Connectors.Simulation
191 /// <summary> 191 /// <summary>
192 /// This is the worker function to send AgentData to a neighbor region 192 /// This is the worker function to send AgentData to a neighbor region
193 /// </summary> 193 /// </summary>
194 private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) 194 private bool UpdateAgent(GridRegion destination, IAgentData cAgentData, int timeout)
195 { 195 {
196 // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start"); 196 // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start");
197 197
@@ -207,7 +207,7 @@ namespace OpenSim.Services.Connectors.Simulation
207 args["destination_name"] = OSD.FromString(destination.RegionName); 207 args["destination_name"] = OSD.FromString(destination.RegionName);
208 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 208 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
209 209
210 OSDMap result = WebUtil.PutToService(uri,args); 210 OSDMap result = WebUtil.PutToService(uri, args, timeout);
211 return result["Success"].AsBoolean(); 211 return result["Success"].AsBoolean();
212 } 212 }
213 catch (Exception e) 213 catch (Exception e)
@@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.Simulation
233 233
234 try 234 try
235 { 235 {
236 OSDMap result = WebUtil.GetFromService(uri); 236 OSDMap result = WebUtil.GetFromService(uri, 10000);
237 if (result["Success"].AsBoolean()) 237 if (result["Success"].AsBoolean())
238 { 238 {
239 // OSDMap args = Util.GetOSDMap(result["_RawResult"].AsString()); 239 // OSDMap args = Util.GetOSDMap(result["_RawResult"].AsString());
@@ -392,7 +392,7 @@ namespace OpenSim.Services.Connectors.Simulation
392 args["destination_name"] = OSD.FromString(destination.RegionName); 392 args["destination_name"] = OSD.FromString(destination.RegionName);
393 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 393 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
394 394
395 WebUtil.PostToService(uri, args); 395 WebUtil.PostToService(uri, args, 40000);
396 } 396 }
397 catch (Exception e) 397 catch (Exception e)
398 { 398 {