Cleaned up debugging messages in the WebRequest handlers

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
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
         {
             int reqnum = m_requestNumber++;
-            m_log.WarnFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+            m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
 
             string errorMessage = "unknown error";
             int tickstart = Util.EnvironmentTickCount();
@@ -177,7 +177,7 @@ namespace OpenSim.Framework
                     {
                         string responseStr = null;
                         responseStr = responseStream.GetStreamString();
-                        m_log.WarnFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr);
+                        // m_log.DebugFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr);
                         return CanonicalizeResults(responseStr);
                     }
                 }
@@ -197,9 +197,11 @@ namespace OpenSim.Framework
             }
             finally
             {
+                // This just dumps a warning for any operation that takes more than 100 ms
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                 if (tickdiff > 100)
-                    m_log.WarnFormat("[WEB UTIL]: request <{0}> took {1} milliseconds",reqnum,tickdiff);
+                    m_log.WarnFormat("[WEB UTIL]: request <{0}> (URI:{1}, METHOD:{2}) took {3} milliseconds",
+                                     reqnum,url,method,tickdiff);
             }
             
             m_log.WarnFormat("[WEB UTIL] <{0}> request failed: {1}",reqnum,errorMessage);
@@ -260,7 +262,7 @@ namespace OpenSim.Framework
         {
             int reqnum = m_requestNumber++;
             string method = data["RequestMethod"] != null ? data["RequestMethod"] : "unknown";
-            m_log.WarnFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method);
+            m_log.DebugFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method);
 
             string errorMessage;
             int tickstart = Util.EnvironmentTickCount();
@@ -321,7 +323,8 @@ namespace OpenSim.Framework
             {
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                 if (tickdiff > 100)
-                    m_log.WarnFormat("[WEB UTIL]: request <{0}> took {1} milliseconds",reqnum,tickdiff);
+                    m_log.WarnFormat("[WEB UTIL]: request <{0}> (URI:{1}, METHOD:{2}) took {3} milliseconds",
+                                     reqnum,url,method,tickdiff);
             }
 
             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
 
         public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason)
         {
-            m_log.WarnFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start");
+            // m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start");
 
             myipaddress = String.Empty;
             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
         /// </summary>
         public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason)
         {
-            m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start");
             
             reason = String.Empty;
             if (destination == null)
@@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         private bool UpdateAgent(GridRegion destination, IAgentData cAgentData)
         {
-            m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start");
 
             // Eventually, we want to use a caps url instead of the agentID
             string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/";
@@ -174,7 +174,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
         {
-            m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start");
 
             agent = null;
 
@@ -208,7 +208,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         public bool QueryAccess(GridRegion destination, UUID id)
         {
-            m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess start");
 
             IPEndPoint ext = destination.ExternalEndPoint;
             if (ext == null) return false;
@@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         public bool ReleaseAgent(UUID origin, UUID id, string uri)
         {
-            m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: ReleaseAgent start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: ReleaseAgent start");
 
             try
             {
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         public bool CloseAgent(GridRegion destination, UUID id)
         {
-            m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
 
             string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
 
@@ -281,7 +281,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall)
         {
-            m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start");
 
             string uri = destination.ServerURI + ObjectPath() + sog.UUID + "/";