Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle

2 files changed, 21 insertions, 3 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 632b551..56155dd 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Servers
             List<Thread> threads = ThreadTracker.GetThreads();
             if (threads == null)
             {
-                sb.Append("Thread tracking is only enabled in DEBUG mode.");
+                sb.Append("OpenSim thread tracking is only enabled in DEBUG mode.");
             }
             else
             {
@@ -264,6 +264,12 @@ namespace OpenSim.Framework.Servers
                     }
                 }
             }
+            int workers = 0, ports = 0, maxWorkers = 0, maxPorts = 0;
+            ThreadPool.GetAvailableThreads(out workers, out ports);
+            ThreadPool.GetMaxThreads(out maxWorkers, out maxPorts);
+
+            sb.Append(Environment.NewLine + "*** ThreadPool threads ***"  + Environment.NewLine);
+            sb.Append("workers: " + (maxWorkers - workers) + " (" + maxWorkers + "); ports: " + (maxPorts - ports) + " (" + maxPorts + ")" + Environment.NewLine);
 
             return sb.ToString();
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
index 8a490f7..4543fd5 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
@@ -28,14 +28,21 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 
+using log4net;
+
 namespace OpenSim.Framework.Servers.HttpServer
 {
     public class SynchronousRestFormsRequester
     {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        
         /// <summary>
         /// Perform a synchronous REST request.
         /// </summary>
@@ -72,8 +79,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                     requestStream = request.GetRequestStream();
                     requestStream.Write(buffer.ToArray(), 0, length);
                 }
-                catch
+                catch (Exception e)
                 {
+                    m_log.DebugFormat("[FORMS]: exception occured on sending request {0}", e.Message);
                 }
                 finally
                 {
@@ -102,7 +110,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 respstring = reader.ReadToEnd();
                             }
                         }
-                        catch { }
+                        catch (Exception e)
+                        {
+                            m_log.DebugFormat("[FORMS]: exception occured on receiving reply {0}", e.Message);
+                        }
                         finally
                         {
                             if (respStream != null)
@@ -114,6 +125,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             catch (System.InvalidOperationException)
             {
                 // This is what happens when there is invalid XML
+                m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving request");
             }
             return respstring;
         }