ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Converted logging to use log4net.

Browse Source 
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
This commit is contained in:
Jeff Ames
2008-02-05 19:44:27 +00:00
parent 7a61bcff86
commit 6ed5283bc0
173 changed files with 2175 additions and 1950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -41,6 +41,8 @@ namespace OpenSim.Framework.Servers
{
public class BaseHttpServer
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
protected Thread m_workerThread;
protected HttpListener m_httpListener;
protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
@@ -296,7 +298,7 @@ namespace OpenSim.Framework.Servers
}
catch (Exception ex)
{
MainLog.Instance.Warn("HTTPD", "Error - " + ex.Message);
m_log.Warn("[HTTPD]: Error - " + ex.Message);
}
finally
{
@@ -319,7 +321,7 @@ namespace OpenSim.Framework.Servers
LLSD llsdResponse = null;
try { llsdRequest = LLSDParser.DeserializeXml(requestBody); }
catch (Exception ex) { MainLog.Instance.Warn("HTTPD", "Error - " + ex.Message); }
catch (Exception ex) { m_log.Warn("[HTTPD]: Error - " + ex.Message); }
if (llsdRequest != null && m_llsdHandler != null)
{
@@ -348,7 +350,7 @@ namespace OpenSim.Framework.Servers
}
catch (Exception ex)
{
MainLog.Instance.Warn("HTTPD", "Error - " + ex.Message);
m_log.Warn("[HTTPD]: Error - " + ex.Message);
}
finally
{
@@ -396,7 +398,7 @@ namespace OpenSim.Framework.Servers
foreach (string headername in rHeaders)
{
//MainLog.Instance.Warn("HEADER", headername + "=" + request.Headers[headername]);
//m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]);
headervals[headername] = request.Headers[headername];
}
@@ -407,9 +409,9 @@ namespace OpenSim.Framework.Servers
if (keysvals.Contains("method"))
{
//MainLog.Instance.Warn("HTTP", "Contains Method");
//m_log.Warn("[HTTP]: Contains Method");
string method = (string) keysvals["method"];
//MainLog.Instance.Warn("HTTP", requestBody);
//m_log.Warn("[HTTP]: " + requestBody);
GenericHTTPMethod requestprocessor;
bool foundHandler = TryGetHTTPHandler(method, out requestprocessor);
if (foundHandler)
@@ -422,13 +424,13 @@ namespace OpenSim.Framework.Servers
}
else
{
//MainLog.Instance.Warn("HTTP", "Handler Not Found");
//m_log.Warn("[HTTP]: Handler Not Found");
SendHTML404(response, host);
}
}
else
{
//MainLog.Instance.Warn("HTTP", "No Method specified");
//m_log.Warn("[HTTP]: No Method specified");
SendHTML404(response, host);
}
}
@@ -461,7 +463,7 @@ namespace OpenSim.Framework.Servers
}
catch (Exception ex)
{
MainLog.Instance.Warn("HTTPD", "Error - " + ex.Message);
m_log.Warn("[HTTPD]: Error - " + ex.Message);
}
finally
{
@@ -488,7 +490,7 @@ namespace OpenSim.Framework.Servers
}
catch (Exception ex)
{
MainLog.Instance.Warn("HTTPD", "Error - " + ex.Message);
m_log.Warn("[HTTPD]: Error - " + ex.Message);
}
finally
{
@@ -513,7 +515,7 @@ namespace OpenSim.Framework.Servers
}
catch (Exception ex)
{
MainLog.Instance.Warn("HTTPD", "Error - " + ex.Message);
m_log.Warn("[HTTPD]: Error - " + ex.Message);
}
finally
{
@@ -523,7 +525,7 @@ namespace OpenSim.Framework.Servers
public void Start()
{
MainLog.Instance.Verbose("HTTPD", "Starting up HTTP Server");
m_log.Info("[HTTPD]: Starting up HTTP Server");
m_workerThread = new Thread(new ThreadStart(StartHTTP));
m_workerThread.IsBackground = true;
@@ -534,7 +536,7 @@ namespace OpenSim.Framework.Servers
{
try
{
MainLog.Instance.Verbose("HTTPD", "Spawned main thread OK");
m_log.Info("[HTTPD]: Spawned main thread OK");
m_httpListener = new HttpListener();
if (!m_ssl)
@@ -556,7 +558,7 @@ namespace OpenSim.Framework.Servers
}
catch (Exception e)
{
MainLog.Instance.Warn("HTTPD", "Error - " + e.Message);
m_log.Warn("[HTTPD]: Error - " + e.Message);
}
}

12
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -27,7 +27,6 @@
*/
using System;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Servers
@@ -37,8 +36,7 @@ namespace OpenSim.Framework.Servers
/// </summary>
public abstract class BaseOpenSimServer
{
protected LogBase m_log;
protected ConsoleBase m_console;
protected DateTime m_startuptime;
public BaseOpenSimServer()
@@ -56,7 +54,7 @@ namespace OpenSim.Framework.Servers
switch (command)
{
case "help":
m_log.Notice("show uptime - show server startup and uptime.");
m_console.Notice("show uptime - show server startup and uptime.");
break;
case "show":
@@ -77,8 +75,8 @@ namespace OpenSim.Framework.Servers
switch (ShowWhat)
{
case "uptime":
m_log.Notice("Server has been running since " + m_startuptime.ToString());
m_log.Notice("That is " + (DateTime.Now - m_startuptime).ToString());
m_console.Notice("Server has been running since " + m_startuptime.ToString());
m_console.Notice("That is " + (DateTime.Now - m_startuptime).ToString());
break;
}
}

4
OpenSim/Framework/Servers/CheckSumServer.cs
View File

@@ -31,7 +31,7 @@ namespace OpenSim.Framework.Servers
/*
public class CheckSumServer : UDPServerBase
{
//protected ConsoleBase m_log;
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public CheckSumServer(int port)
: base(port)
@@ -114,7 +114,7 @@ namespace OpenSim.Framework.Servers
}
catch (Exception)
{
MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
m_log.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
}
}