ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Switch on HttpServer_OpenSim.dll logging temporarily"

Browse Source 
This reverts commit 0e9dcbbea7.
This commit is contained in:
justincc
2009-12-16 16:44:38 +00:00
parent 0e9dcbbea7
commit 09618626d7
136 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -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;
}
}
}
}