Converted logging to use log4net.

Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.

2 files changed, 23 insertions, 29 deletions

diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 3d5ceb4..c16b0f8 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -41,6 +41,8 @@ namespace OpenSim.Grid.MessagingServer
     /// </summary>
     public class OpenMessage_Main : BaseOpenSimServer, conscmd_callback
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private MessageServerConfig Cfg;
 
         //public UserManager m_userManager;
@@ -51,7 +53,9 @@ namespace OpenSim.Grid.MessagingServer
         [STAThread]
         public static void Main(string[] args)
         {
-            Console.WriteLine("Launching MessagingServer...");
+            log4net.Config.XmlConfigurator.Configure();
+
+            m_log.Info("Launching MessagingServer...");
 
             OpenMessage_Main messageserver = new OpenMessage_Main();
 
@@ -61,22 +65,17 @@ namespace OpenSim.Grid.MessagingServer
 
         private OpenMessage_Main()
         {
-            if (!Directory.Exists(Util.logDir()))
-            {
-                Directory.CreateDirectory(Util.logDir());
-            }
-            m_log =
-                new LogBase((Path.Combine(Util.logDir(), "opengrid-messagingserver-console.log")), "OpenMessage", this, true);
-            MainLog.Instance = m_log;
+            m_console = new ConsoleBase("OpenMessage", this);
+            MainConsole.Instance = m_console;
         }
 
         private void Work()
         {
-            m_log.Notice("Enter help for a list of commands\n");
+            m_console.Notice("Enter help for a list of commands\n");
 
             while (true)
             {
-                m_log.MainLogPrompt();
+                m_console.Prompt();
             }
         }
 
@@ -84,9 +83,7 @@ namespace OpenSim.Grid.MessagingServer
         {
             Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
 
-            
-
-            MainLog.Instance.Verbose("REGION", "Starting HTTP process");
+            m_log.Info("[REGION]: Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(Cfg.HttpPort);
 
             //httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
@@ -104,10 +101,9 @@ namespace OpenSim.Grid.MessagingServer
                 //new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod));
 
             httpServer.Start();
-            m_log.Status("SERVER", "Messageserver 0.4 - Startup complete");
+            m_log.Info("[SERVER]: Messageserver 0.4 - Startup complete");
         }
 
-
         public void do_create(string what)
         {
             switch (what)
@@ -120,7 +116,7 @@ namespace OpenSim.Grid.MessagingServer
                             //m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
                     } catch (Exception ex)
                     {
-                        m_log.Error("SERVER", "Error creating user: {0}", ex.ToString());
+                        m_console.Error("[SERVER]: Error creating user: {0}", ex.ToString());
                     }
 
                     try
@@ -130,9 +126,9 @@ namespace OpenSim.Grid.MessagingServer
                     }
                     catch (Exception ex)
                     {
-                        m_log.Error("SERVER", "Error creating inventory for user: {0}", ex.ToString());
+                        m_console.Error("[SERVER]: Error creating inventory for user: {0}", ex.ToString());
                     }
-                   // m_lastCreatedUser = userID;
+                    // m_lastCreatedUser = userID;
                     break;
             }
         }
@@ -144,11 +140,11 @@ namespace OpenSim.Grid.MessagingServer
             switch (cmd)
             {
                 case "help":
-                    m_log.Notice("shutdown - shutdown the message server (USE CAUTION!)");
+                    m_console.Notice("shutdown - shutdown the message server (USE CAUTION!)");
                     break;
 
                 case "shutdown":
-                    m_log.Close();
+                    m_console.Close();
                     Environment.Exit(0);
                     break;
             }
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 056bfcb..c2669b0 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -43,7 +43,8 @@ namespace OpenSim.Grid.MessagingServer
 {
     public class MessageService
     {
-        private LogBase m_log;
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private MessageServerConfig m_cfg;
 
         //A hashtable of all current presences this server knows about
@@ -58,13 +59,10 @@ namespace OpenSim.Grid.MessagingServer
         // Hashtable containing work units that need to be processed
         private Hashtable m_unProcessedWorkUnits = new Hashtable();
 
-
-        public MessageService(LogBase log, MessageServerConfig cfg)
+        public MessageService(MessageServerConfig cfg)
         {
-            m_log = log;
             m_cfg = cfg;
         }
-
         
         #region RegionComms Methods
 
@@ -84,7 +82,7 @@ namespace OpenSim.Grid.MessagingServer
             ArrayList SendParams = new ArrayList();
             SendParams.Add(PresenceParams);
 
-            MainLog.Instance.Verbose("PRESENCE", "Informing " + whichRegion.regionName + " at " + whichRegion.httpServerURI);
+            m_log.Info("[PRESENCE]: Informing " + whichRegion.regionName + " at " + whichRegion.httpServerURI);
             // Send
             XmlRpcRequest RegionReq = new XmlRpcRequest("presence_update", SendParams);
             XmlRpcResponse RegionResp = RegionReq.Send(whichRegion.httpServerURI, 6000);
@@ -292,7 +290,7 @@ namespace OpenSim.Grid.MessagingServer
             }
             catch (WebException e)
             {
-                MainLog.Instance.Warn("Error when trying to fetch Avatar's friends list: " +
+                m_log.Warn("Error when trying to fetch Avatar's friends list: " +
                                       e.Message);
                 // Return Empty list (no friends)
             }
@@ -439,7 +437,7 @@ namespace OpenSim.Grid.MessagingServer
 
                 if (responseData.ContainsKey("error"))
                 {
-                    m_log.Error("GRID","error received from grid server" + responseData["error"]);
+                    m_log.Error("[GRID]: error received from grid server" + responseData["error"]);
                     return null;
                 }
 
@@ -465,7 +463,7 @@ namespace OpenSim.Grid.MessagingServer
             }
             catch (WebException)
             {
-                MainLog.Instance.Error("GRID",
+                m_log.Error("[GRID]: " +
                                        "Region lookup failed for: " + regionHandle.ToString() +
                                        " - Is the GridServer down?");
                 return null;