aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-09-14 00:11:23 +0200
committerMelanie2012-09-30 16:30:16 +0100
commit060d6fe8f4eba0c1b1c0cb4f52acd2fd59725c66 (patch)
treef1c7164fe90c22ee0ce4f9f5418e1fe4cc3fa7e8
parentAdd using clause I missed (diff)
downloadopensim-SC_OLD-060d6fe8f4eba0c1b1c0cb4f52acd2fd59725c66.zip
opensim-SC_OLD-060d6fe8f4eba0c1b1c0cb4f52acd2fd59725c66.tar.gz
opensim-SC_OLD-060d6fe8f4eba0c1b1c0cb4f52acd2fd59725c66.tar.bz2
opensim-SC_OLD-060d6fe8f4eba0c1b1c0cb4f52acd2fd59725c66.tar.xz
Allow setting max connections for an endpoint
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs2
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ff57422..d5bc3c3 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -648,7 +648,7 @@ namespace OpenSim.Framework.Servers.HttpServer
648 // Every month or so this will wrap and give bad numbers, not really a problem 648 // Every month or so this will wrap and give bad numbers, not really a problem
649 // since its just for reporting 649 // since its just for reporting
650 int tickdiff = requestEndTick - requestStartTick; 650 int tickdiff = requestEndTick - requestStartTick;
651 if (tickdiff > 3000) 651 if (tickdiff > 3000 && requestHandler.Name != "GetTexture")
652 { 652 {
653 m_log.InfoFormat( 653 m_log.InfoFormat(
654 "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms", 654 "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms",
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index e4c3eaf..086b5ad 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Services.Connectors
108 if (asset == null) 108 if (asset == null)
109 { 109 {
110 asset = SynchronousRestObjectRequester. 110 asset = SynchronousRestObjectRequester.
111 MakeRequest<int, AssetBase>("GET", uri, 0); 111 MakeRequest<int, AssetBase>("GET", uri, 0, 30);
112 112
113 if (m_Cache != null) 113 if (m_Cache != null)
114 m_Cache.Cache(asset); 114 m_Cache.Cache(asset);
@@ -221,7 +221,7 @@ namespace OpenSim.Services.Connectors
221 m_AssetHandlers.Remove(id); 221 m_AssetHandlers.Remove(id);
222 } 222 }
223 handlers.Invoke(a); 223 handlers.Invoke(a);
224 }); 224 }, 30);
225 225
226 success = true; 226 success = true;
227 } 227 }
@@ -326,4 +326,4 @@ namespace OpenSim.Services.Connectors
326 return false; 326 return false;
327 } 327 }
328 } 328 }
329} \ No newline at end of file 329}