From db00402fa86db6c3d945a48df13e266506e61486 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 5 Oct 2012 00:14:49 +0100
Subject: make sure a buffer is closed, and changed a misleading log msg

---
 OpenSim/Framework/WebUtil.cs | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 8094b6d..30a8c28 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -706,9 +706,10 @@ namespace OpenSim.Framework
             // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
 
             int tickstart = Util.EnvironmentTickCount();
-            int tickdata = 0;
+//            int tickdata = 0;
+            int tickdiff = 0;
 
-            //            m_log.DebugFormat("[ASYNC REQUEST]: Starting {0} {1}", verb, requestUrl);
+//            m_log.DebugFormat("[ASYNC REQUEST]: Starting {0} {1}", verb, requestUrl);
 
             Type type = typeof(TRequest);
 
@@ -751,8 +752,8 @@ namespace OpenSim.Framework
                     requestStream.Close();
 
                     // capture how much time was spent writing
-                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
-
+                    // useless in this async
+//                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
                     request.BeginGetResponse(delegate(IAsyncResult ar)
                     {
                         response = request.EndGetResponse(ar);
@@ -769,7 +770,8 @@ namespace OpenSim.Framework
                         finally
                         {
                             // Let's not close this
-                            //buffer.Close();
+                            // yes do close it
+                            buffer.Close();
                             respStream.Close();
                             response.Close();
                         }
@@ -837,7 +839,6 @@ namespace OpenSim.Framework
                     }
     
                     //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
-
                     try
                     {
                         action(deserial);
@@ -852,9 +853,10 @@ namespace OpenSim.Framework
                 }, null);
             }
 
-            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
             if (tickdiff > WebUtil.LongCallTime)
             {
+/*
                 string originalRequest = null;
 
                 if (buffer != null)
@@ -873,6 +875,13 @@ namespace OpenSim.Framework
                     tickdiff,
                     tickdata,
                     originalRequest);
+*/
+                m_log.InfoFormat(
+                    "[ASYNC REQUEST]:  Slow WebRequest SETUP <{0}> {1} {2} took {3}ms",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff);
             }
         }
     }
@@ -903,6 +912,8 @@ namespace OpenSim.Framework
             request.Method = verb;
             string respstring = String.Empty;
 
+            int tickset = Util.EnvironmentTickCountSubtract(tickstart);
+
             using (MemoryStream buffer = new MemoryStream())
             {
                 if ((verb == "POST") || (verb == "PUT"))
@@ -979,11 +990,12 @@ namespace OpenSim.Framework
             int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
             if (tickdiff > WebUtil.LongCallTime)
                 m_log.InfoFormat(
-                    "[FORMS]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                    "[FORMS]: Slow request to <{0}> {1} {2} took {3}ms {4}ms writing {5}",
                     reqnum,
                     verb,
                     requestUrl,
                     tickdiff,
+                    tickset,
                     tickdata,
                     obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
 
-- 
cgit v1.1