From 09618626d7c99bc947c1da847ed3bcfde8373c73 Mon Sep 17 00:00:00 2001
From: justincc
Date: Wed, 16 Dec 2009 16:44:38 +0000
Subject: Revert "Switch on HttpServer_OpenSim.dll logging temporarily"

This reverts commit 0e9dcbbea70585970b78316fe6d65f6cb555b74d.
---
 .../Framework/Servers/HttpServer/BaseHttpServer.cs | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 8eeb067..3d6051d 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -40,8 +40,7 @@ using HttpServer;
 using log4net;
 using Nwc.XmlRpc;
 using OpenMetaverse.StructuredData;
-using CoolHTTPListener = HttpServer.HttpListener;
-using CoolHttpServer = HttpServer;
+using CoolHTTPListener = HttpServer.HttpListener;
 using HttpListener=System.Net.HttpListener;
 
 namespace OpenSim.Framework.Servers.HttpServer
@@ -730,12 +729,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                             xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint);
                         }
                         catch(Exception e)
-                        {
-                            string errorMessage
-                                = String.Format(
-                                    "Requested method [{0}] from {1} threw exception: {2} {3}",
-                                    methodName, request.RemoteIPEndPoint.Address, e.Message, e.StackTrace);
-
+                        {
+                            string errorMessage
+                                = String.Format(
+                                    "Requested method [{0}] from {1} threw exception: {2} {3}",
+                                    methodName, request.RemoteIPEndPoint.Address, e.Message, e.StackTrace);
+
                             m_log.ErrorFormat("[BASE HTTP SERVER]: {0}", errorMessage);
 
                             // if the registered XmlRpc method threw an exception, we pass a fault-code along
@@ -1820,32 +1819,34 @@ namespace OpenSim.Framework.Servers.HttpServer
     /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
     public class HttpServerLogWriter : ILogWriter
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public void Write(object source, LogPrio priority, string message)
         {
+            /*
             switch (priority)
-            {
-                case CoolHttpServer.LogPrio.Debug:
+            {
+                case HttpServer.LogPrio.Debug:
                     m_log.DebugFormat("[{0}]: {1}", source.ToString(), message);
-                    break;
-                case CoolHttpServer.LogPrio.Error:
+                    break;
+                case HttpServer.LogPrio.Error:
                     m_log.ErrorFormat("[{0}]: {1}", source.ToString(), message);
-                    break;
-                case CoolHttpServer.LogPrio.Info:
+                    break;
+                case HttpServer.LogPrio.Info:
                     m_log.InfoFormat("[{0}]: {1}", source.ToString(), message);
-                    break;
-                case CoolHttpServer.LogPrio.Warning:
+                    break;
+                case HttpServer.LogPrio.Warning:
                     m_log.WarnFormat("[{0}]: {1}", source.ToString(), message);
-                    break;
-                case CoolHttpServer.LogPrio.Fatal:
+                    break;
+                case HttpServer.LogPrio.Fatal:
                     m_log.ErrorFormat("[{0}]: FATAL! - {1}", source.ToString(), message);
                     break;
                 default:
                     break;
             }
+            */
             
             return;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1