diff options
author | Mic Bowman | 2011-01-03 17:16:22 -0800 |
---|---|---|
committer | Mic Bowman | 2011-01-03 17:16:22 -0800 |
commit | e0da281e3d70fbe1752815f5a7ae4b3ed0cf15ba (patch) | |
tree | b04b54b8925bf774d919a85c2112c2e213072258 | |
parent | Merge branch 'master' into cmickeyb (diff) | |
download | opensim-SC_OLD-e0da281e3d70fbe1752815f5a7ae4b3ed0cf15ba.zip opensim-SC_OLD-e0da281e3d70fbe1752815f5a7ae4b3ed0cf15ba.tar.gz opensim-SC_OLD-e0da281e3d70fbe1752815f5a7ae4b3ed0cf15ba.tar.bz2 opensim-SC_OLD-e0da281e3d70fbe1752815f5a7ae4b3ed0cf15ba.tar.xz |
Cleaned up debugging messages in the WebRequest handlers
Diffstat (limited to '')
3 files changed, 16 insertions, 13 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 1cd9054..a00ea88 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim.Framework | |||
146 | public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) | 146 | public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) |
147 | { | 147 | { |
148 | int reqnum = m_requestNumber++; | 148 | int reqnum = m_requestNumber++; |
149 | m_log.WarnFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method); | 149 | m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method); |
150 | 150 | ||
151 | string errorMessage = "unknown error"; | 151 | string errorMessage = "unknown error"; |
152 | int tickstart = Util.EnvironmentTickCount(); | 152 | int tickstart = Util.EnvironmentTickCount(); |
@@ -177,7 +177,7 @@ namespace OpenSim.Framework | |||
177 | { | 177 | { |
178 | string responseStr = null; | 178 | string responseStr = null; |
179 | responseStr = responseStream.GetStreamString(); | 179 | responseStr = responseStream.GetStreamString(); |
180 | m_log.WarnFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr); | 180 | // m_log.DebugFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr); |
181 | return CanonicalizeResults(responseStr); | 181 | return CanonicalizeResults(responseStr); |
182 | } | 182 | } |
183 | } | 183 | } |
@@ -197,9 +197,11 @@ namespace OpenSim.Framework | |||
197 | } | 197 | } |
198 | finally | 198 | finally |
199 | { | 199 | { |
200 | // This just dumps a warning for any operation that takes more than 100 ms | ||
200 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); | 201 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); |
201 | if (tickdiff > 100) | 202 | if (tickdiff > 100) |
202 | m_log.WarnFormat("[WEB UTIL]: request <{0}> took {1} milliseconds",reqnum,tickdiff); | 203 | m_log.WarnFormat("[WEB UTIL]: request <{0}> (URI:{1}, METHOD:{2}) took {3} milliseconds", |
204 | reqnum,url,method,tickdiff); | ||
203 | } | 205 | } |
204 | 206 | ||
205 | m_log.WarnFormat("[WEB UTIL] <{0}> request failed: {1}",reqnum,errorMessage); | 207 | m_log.WarnFormat("[WEB UTIL] <{0}> request failed: {1}",reqnum,errorMessage); |
@@ -260,7 +262,7 @@ namespace OpenSim.Framework | |||
260 | { | 262 | { |
261 | int reqnum = m_requestNumber++; | 263 | int reqnum = m_requestNumber++; |
262 | string method = data["RequestMethod"] != null ? data["RequestMethod"] : "unknown"; | 264 | string method = data["RequestMethod"] != null ? data["RequestMethod"] : "unknown"; |
263 | m_log.WarnFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method); | 265 | m_log.DebugFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method); |
264 | 266 | ||
265 | string errorMessage; | 267 | string errorMessage; |
266 | int tickstart = Util.EnvironmentTickCount(); | 268 | int tickstart = Util.EnvironmentTickCount(); |
@@ -321,7 +323,8 @@ namespace OpenSim.Framework | |||
321 | { | 323 | { |
322 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); | 324 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); |
323 | if (tickdiff > 100) | 325 | if (tickdiff > 100) |
324 | m_log.WarnFormat("[WEB UTIL]: request <{0}> took {1} milliseconds",reqnum,tickdiff); | 326 | m_log.WarnFormat("[WEB UTIL]: request <{0}> (URI:{1}, METHOD:{2}) took {3} milliseconds", |
327 | reqnum,url,method,tickdiff); | ||
325 | } | 328 | } |
326 | 329 | ||
327 | m_log.WarnFormat("[WEB UTIL]: <{0}> request failed: {1}",reqnum,errorMessage); | 330 | m_log.WarnFormat("[WEB UTIL]: <{0}> request failed: {1}",reqnum,errorMessage); |
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 6c69fec..1aa3282 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -283,7 +283,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
283 | 283 | ||
284 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason) | 284 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason) |
285 | { | 285 | { |
286 | m_log.WarnFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start"); | 286 | // m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start"); |
287 | 287 | ||
288 | myipaddress = String.Empty; | 288 | myipaddress = String.Empty; |
289 | reason = String.Empty; | 289 | reason = String.Empty; |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 4facc4a..b183364 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
80 | /// </summary> | 80 | /// </summary> |
81 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) | 81 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) |
82 | { | 82 | { |
83 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start"); | 83 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start"); |
84 | 84 | ||
85 | reason = String.Empty; | 85 | reason = String.Empty; |
86 | if (destination == null) | 86 | if (destination == null) |
@@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
143 | /// </summary> | 143 | /// </summary> |
144 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) | 144 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) |
145 | { | 145 | { |
146 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start"); | 146 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start"); |
147 | 147 | ||
148 | // Eventually, we want to use a caps url instead of the agentID | 148 | // Eventually, we want to use a caps url instead of the agentID |
149 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; | 149 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; |
@@ -174,7 +174,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
174 | /// </summary> | 174 | /// </summary> |
175 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) | 175 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) |
176 | { | 176 | { |
177 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start"); | 177 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start"); |
178 | 178 | ||
179 | agent = null; | 179 | agent = null; |
180 | 180 | ||
@@ -208,7 +208,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
208 | /// </summary> | 208 | /// </summary> |
209 | public bool QueryAccess(GridRegion destination, UUID id) | 209 | public bool QueryAccess(GridRegion destination, UUID id) |
210 | { | 210 | { |
211 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess start"); | 211 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess start"); |
212 | 212 | ||
213 | IPEndPoint ext = destination.ExternalEndPoint; | 213 | IPEndPoint ext = destination.ExternalEndPoint; |
214 | if (ext == null) return false; | 214 | if (ext == null) return false; |
@@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
233 | /// </summary> | 233 | /// </summary> |
234 | public bool ReleaseAgent(UUID origin, UUID id, string uri) | 234 | public bool ReleaseAgent(UUID origin, UUID id, string uri) |
235 | { | 235 | { |
236 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: ReleaseAgent start"); | 236 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: ReleaseAgent start"); |
237 | 237 | ||
238 | try | 238 | try |
239 | { | 239 | { |
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
251 | /// </summary> | 251 | /// </summary> |
252 | public bool CloseAgent(GridRegion destination, UUID id) | 252 | public bool CloseAgent(GridRegion destination, UUID id) |
253 | { | 253 | { |
254 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); | 254 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); |
255 | 255 | ||
256 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 256 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
257 | 257 | ||
@@ -281,7 +281,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
281 | /// </summary> | 281 | /// </summary> |
282 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) | 282 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) |
283 | { | 283 | { |
284 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start"); | 284 | // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start"); |
285 | 285 | ||
286 | string uri = destination.ServerURI + ObjectPath() + sog.UUID + "/"; | 286 | string uri = destination.ServerURI + ObjectPath() + sog.UUID + "/"; |
287 | 287 | ||