Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:

* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
This commit is contained in:
Charles Krinke
2009-02-22 20:52:55 +00:00
parent 913654f2c9
commit 8f55b9d735
117 changed files with 580 additions and 409 deletions

View File

@@ -28,11 +28,15 @@
using System;
using Nini.Config;
using log4net.Config;
using log4net;
using System.Reflection;
namespace OpenSim.Grid.AssetInventoryServer
{
class MainEntry
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
static void Main(string[] args)
{
XmlConfigurator.Configure();
@@ -46,7 +50,7 @@ namespace OpenSim.Grid.AssetInventoryServer
Console.CancelKeyPress +=
delegate(object sender, ConsoleCancelEventArgs e)
{
Console.WriteLine("AssetInventory server is shutting down...");
m_log.Info("AssetInventory server is shutting down...");
server.Shutdown();
Environment.Exit(0);
};

View File

@@ -182,7 +182,7 @@ namespace OpenSim.Grid.GridServer
public string RestSetSimMethod(string request, string path, string param,
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{
Console.WriteLine("Processing region update via REST method");
m_log.Info("Processing region update via REST method");
RegionProfileData theSim;
theSim = m_gridDBService.GetRegion(new UUID(param));
if (theSim == null)

View File

@@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer
else if (requestData.ContainsKey("region_handle"))
{
//CFK: The if/else below this makes this message redundant.
//CFK: Console.WriteLine("requesting data for region " + (string) requestData["region_handle"]);
//CFK: m_log.Info("requesting data for region " + (string) requestData["region_handle"]);
ulong regionHandle = Convert.ToUInt64((string)requestData["region_handle"]);
simData = m_gridDBService.GetRegion(regionHandle);
if (simData == null)

View File

@@ -402,7 +402,7 @@ namespace OpenSim.Grid.UserServer
Hashtable requestData = (Hashtable) request.Params[0];
UserProfileData userProfile;
//CFK: this clogs the UserServer log and is not necessary at this time.
//CFK: Console.WriteLine("METHOD BY UUID CALLED");
//CFK: m_log.Debug("METHOD BY UUID CALLED");
if (requestData.Contains("avatar_uuid"))
{
try
@@ -435,7 +435,7 @@ namespace OpenSim.Grid.UserServer
Hashtable requestData = (Hashtable) request.Params[0];
UserProfileData userProfile;
//CFK: this clogs the UserServer log and is not necessary at this time.
//CFK: Console.WriteLine("METHOD BY UUID CALLED");
//CFK: m_log.Debug("METHOD BY UUID CALLED");
if (requestData.Contains("avatar_uuid"))
{
UUID guess;