aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-03 01:45:49 +0100
committerJustin Clark-Casey (justincc)2012-05-03 01:45:49 +0100
commit231a3bf147315a9284140476d2b09e13c3fee1c0 (patch)
treef04ffb5bb43d919c1687af57e4cb48829f6dc437 /OpenSim/Region/CoreModules
parentComment out the five second sleep in etm.DoTeleport() if the old agent needs ... (diff)
downloadopensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.zip
opensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.gz
opensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.bz2
opensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.xz
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
This is most useful for capabilities where the url is not self-describing.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs33
-rw-r--r--OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs17
3 files changed, 34 insertions, 24 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index f6d4b40..8b7406d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1433,21 +1433,26 @@ namespace OpenSim.Region.CoreModules.World.Land
1433 private void EventManagerOnRegisterCaps(UUID agentID, Caps caps) 1433 private void EventManagerOnRegisterCaps(UUID agentID, Caps caps)
1434 { 1434 {
1435 string capsBase = "/CAPS/" + caps.CapsObjectPath; 1435 string capsBase = "/CAPS/" + caps.CapsObjectPath;
1436 caps.RegisterHandler("RemoteParcelRequest", 1436 caps.RegisterHandler(
1437 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath, 1437 "RemoteParcelRequest",
1438 delegate(string request, string path, string param, 1438 new RestStreamHandler(
1439 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 1439 "POST",
1440 { 1440 capsBase + remoteParcelRequestPath,
1441 return RemoteParcelRequest(request, path, param, agentID, caps); 1441 (request, path, param, httpRequest, httpResponse)
1442 })); 1442 => RemoteParcelRequest(request, path, param, agentID, caps),
1443 "RemoteParcelRequest",
1444 agentID.ToString()));
1445
1443 UUID parcelCapID = UUID.Random(); 1446 UUID parcelCapID = UUID.Random();
1444 caps.RegisterHandler("ParcelPropertiesUpdate", 1447 caps.RegisterHandler(
1445 new RestStreamHandler("POST", "/CAPS/" + parcelCapID, 1448 "ParcelPropertiesUpdate",
1446 delegate(string request, string path, string param, 1449 new RestStreamHandler(
1447 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 1450 "POST",
1448 { 1451 "/CAPS/" + parcelCapID,
1449 return ProcessPropertiesUpdate(request, path, param, agentID, caps); 1452 (request, path, param, httpRequest, httpResponse)
1450 })); 1453 => ProcessPropertiesUpdate(request, path, param, agentID, caps),
1454 "ParcelPropertiesUpdate",
1455 agentID.ToString()));
1451 } 1456 }
1452 private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) 1457 private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
1453 { 1458 {
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 5239f50..601e81e 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -145,7 +145,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
145 145
146 // Even though we're registering for POST we're going to get GETS and UPDATES too 146 // Even though we're registering for POST we're going to get GETS and UPDATES too
147 caps.RegisterHandler( 147 caps.RegisterHandler(
148 "ObjectMedia", new RestStreamHandler("POST", omCapUrl, HandleObjectMediaMessage)); 148 "ObjectMedia",
149 new RestStreamHandler(
150 "POST", omCapUrl, HandleObjectMediaMessage, "ObjectMedia", agentID.ToString()));
149 } 151 }
150 152
151 string omuCapUrl = "/CAPS/" + UUID.Random(); 153 string omuCapUrl = "/CAPS/" + UUID.Random();
@@ -157,7 +159,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
157 159
158 // Even though we're registering for POST we're going to get GETS and UPDATES too 160 // Even though we're registering for POST we're going to get GETS and UPDATES too
159 caps.RegisterHandler( 161 caps.RegisterHandler(
160 "ObjectMediaNavigate", new RestStreamHandler("POST", omuCapUrl, HandleObjectMediaNavigateMessage)); 162 "ObjectMediaNavigate",
163 new RestStreamHandler(
164 "POST", omuCapUrl, HandleObjectMediaNavigateMessage, "ObjectMediaNavigate", agentID.ToString()));
161 } 165 }
162 } 166 }
163 167
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index faaf928..2335bea 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -190,14 +190,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
190 { 190 {
191 //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); 191 //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
192 string capsBase = "/CAPS/" + caps.CapsObjectPath; 192 string capsBase = "/CAPS/" + caps.CapsObjectPath;
193 caps.RegisterHandler("MapLayer", 193 caps.RegisterHandler(
194 new RestStreamHandler("POST", capsBase + m_mapLayerPath, 194 "MapLayer",
195 delegate(string request, string path, string param, 195 new RestStreamHandler(
196 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 196 "POST",
197 { 197 capsBase + m_mapLayerPath,
198 return MapLayerRequest(request, path, param, 198 (request, path, param, httpRequest, httpResponse)
199 agentID, caps); 199 => MapLayerRequest(request, path, param, agentID, caps),
200 })); 200 "MapLayer",
201 agentID.ToString()));
201 } 202 }
202 203
203 /// <summary> 204 /// <summary>