From 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Sun, 22 Feb 2009 20:52:55 +0000
Subject: 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.

---
 OpenSim/Grid/AssetInventoryServer/Main.cs   | 6 +++++-
 OpenSim/Grid/GridServer/GridRestModule.cs   | 2 +-
 OpenSim/Grid/GridServer/GridXmlRpcModule.cs | 2 +-
 OpenSim/Grid/UserServer/UserManager.cs      | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/AssetInventoryServer/Main.cs b/OpenSim/Grid/AssetInventoryServer/Main.cs
index 67aaf95..598b754 100644
--- a/OpenSim/Grid/AssetInventoryServer/Main.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Main.cs
@@ -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);
                     };
diff --git a/OpenSim/Grid/GridServer/GridRestModule.cs b/OpenSim/Grid/GridServer/GridRestModule.cs
index e0c1288..7d3bd18 100644
--- a/OpenSim/Grid/GridServer/GridRestModule.cs
+++ b/OpenSim/Grid/GridServer/GridRestModule.cs
@@ -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)
diff --git a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
index f320ccc..8998b55 100644
--- a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
@@ -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)
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index f3e9884..6229dec 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -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;
-- 
cgit v1.1