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.

1 files changed, 20 insertions, 26 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index a95ea71..35e6495 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -43,6 +43,8 @@ namespace OpenSim.Grid.AssetServer
     /// </summary>
     public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         public AssetConfig m_config;
 
         public static OpenAsset_Main assetserver;   
@@ -55,7 +57,9 @@ namespace OpenSim.Grid.AssetServer
         [STAThread]
         public static void Main(string[] args)
         {
-            Console.WriteLine("Starting...\n");
+            log4net.Config.XmlConfigurator.Configure();
+
+            m_log.Info("Starting...\n");
 
             assetserver = new OpenAsset_Main();
             assetserver.Startup();
@@ -65,42 +69,32 @@ namespace OpenSim.Grid.AssetServer
 
         private void Work()
         {
-            m_log.Notice("Enter help for a list of commands");
+            m_console.Notice("Enter help for a list of commands");
 
             while (true)
             {
-                m_log.MainLogPrompt();
+                m_console.Prompt();
             }
         }
 
         private OpenAsset_Main()
         {
-            if (!Directory.Exists(Util.logDir()))
-            {
-                Directory.CreateDirectory(Util.logDir());
-            }
-            
-            m_log =
-                new LogBase(
-                    (Path.Combine(Util.logDir(), "opengrid-AssetServer-console.log")), 
-                    "OpenAsset", 
-                    this, 
-                    true);
+            m_console = new ConsoleBase("OpenAsset", this);
             
-            MainLog.Instance = m_log;
+            MainConsole.Instance = m_console;
         }
 
         public void Startup()
         {
             m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
 
-            m_log.Verbose("ASSET", "Setting up asset DB");
+            m_log.Info("[ASSET]: Setting up asset DB");
             setupDB(m_config);
 
-            m_log.Verbose("ASSET", "Loading default asset set..");
+            m_log.Info("[ASSET]: Loading default asset set..");
             LoadDefaultAssets();
 
-            m_log.Verbose("ASSET", "Starting HTTP process");
+            m_log.Info("[ASSET]: Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
             
             StatsManager.StartCollectingAssetStats();
@@ -118,7 +112,7 @@ namespace OpenSim.Grid.AssetServer
 
         public IAssetProvider LoadDatabasePlugin(string FileName)
         {
-            MainLog.Instance.Verbose("ASSET SERVER", "LoadDatabasePlugin: Attempting to load " + FileName);
+            m_log.Info("[ASSET SERVER]: LoadDatabasePlugin: Attempting to load " + FileName);
             Assembly pluginAssembly = Assembly.LoadFrom(FileName);
             IAssetProvider assetPlugin = null;
             foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -134,7 +128,7 @@ namespace OpenSim.Grid.AssetServer
                         assetPlugin = plug;
                         assetPlugin.Initialise();
 
-                        MainLog.Instance.Verbose("ASSET SERVER", "Added " + assetPlugin.Name + " " + assetPlugin.Version);
+                        m_log.Info("[ASSET SERVER]: Added " + assetPlugin.Name + " " + assetPlugin.Version);
                         break;
                     }
 
@@ -153,14 +147,14 @@ namespace OpenSim.Grid.AssetServer
                 m_assetProvider = LoadDatabasePlugin(config.DatabaseProvider);
                 if (m_assetProvider == null)
                 {
-                    MainLog.Instance.Error("ASSET", "Failed to load a database plugin, server halting");
+                    m_log.Error("[ASSET]: Failed to load a database plugin, server halting");
                     Environment.Exit(-1);
                 }
             }
             catch (Exception e)
             {
-                MainLog.Instance.Warn("ASSET", "setupDB() - Exception occured");
-                MainLog.Instance.Warn("ASSET", e.ToString());
+                m_log.Warn("[ASSET]: setupDB() - Exception occured");
+                m_log.Warn("[ASSET]: " + e.ToString());
             }
         }
 
@@ -181,18 +175,18 @@ namespace OpenSim.Grid.AssetServer
             switch (cmd)
             {
                 case "help":
-                    m_log.Notice(
+                    m_console.Notice(
                         @"shutdown - shutdown this asset server (USE CAUTION!)
                  stats    - statistical information for this server");                    
                     
                     break;                  
                     
                 case "stats":
-                    m_log.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
+                    m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
                     break;
 
                 case "shutdown":
-                    m_log.Close();
+                    m_console.Close();
                     Environment.Exit(0);
                     break;
             }