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

Allow setting max connections for an endpoint

avinationmerge
Melanie 2012-09-14 00:11:23 +02:00
parent e7932682a2
commit 52d74cf274
2 changed files with 3 additions and 3 deletions
OpenSim
Framework/Servers/HttpServer
Services/Connectors/Asset

2
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -640,7 +640,7 @@ namespace OpenSim.Framework.Servers.HttpServer
// Every month or so this will wrap and give bad numbers, not really a problem // Every month or so this will wrap and give bad numbers, not really a problem
// since its just for reporting // since its just for reporting
int tickdiff = requestEndTick - requestStartTick; int tickdiff = requestEndTick - requestStartTick;
if (tickdiff > 3000) if (tickdiff > 3000 && requestHandler.Name != "GetTexture")
{ {
m_log.InfoFormat( m_log.InfoFormat(
"[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms", "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms",

4
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors
if (asset == null || asset.Data == null || asset.Data.Length == 0) if (asset == null || asset.Data == null || asset.Data.Length == 0)
{ {
asset = SynchronousRestObjectRequester. asset = SynchronousRestObjectRequester.
MakeRequest<int, AssetBase>("GET", uri, 0); MakeRequest<int, AssetBase>("GET", uri, 0, 30);
if (m_Cache != null) if (m_Cache != null)
m_Cache.Cache(asset); m_Cache.Cache(asset);
@ -321,7 +321,7 @@ namespace OpenSim.Services.Connectors
h.Invoke(a); h.Invoke(a);
if (handlers != null) if (handlers != null)
handlers.Clear(); handlers.Clear();
}); }, 30);
success = true; success = true;
} }