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, 7 insertions, 12 deletions

diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index 8f4957c..8eebe35 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -47,10 +47,7 @@ namespace OpenSim.Tools.Export
             // AddinManager.Initialize(".");
             // AddinManager.Registry.Update(null);
 
-            // TODO: this really sucks, but given the way we do
-            // logging in OpenSim, we need to establish a log up front
-
-            MainLog.Instance = CreateLog();
+            MainConsole.Instance = CreateConsole();
 
             sman = new StorageManager(
                 startup.GetString("storage_plugin", "OpenSim.DataStore.NullStorage.dll"),
@@ -61,6 +58,8 @@ namespace OpenSim.Tools.Export
 
         public static void Main(string[] args)
         {
+            log4net.Config.XmlConfigurator.Configure();
+
             OpenSimExport export = new OpenSimExport(InitConfig(args));
             RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false);
 
@@ -71,17 +70,11 @@ namespace OpenSim.Tools.Export
             }
         }
 
-        protected LogBase CreateLog()
+        protected ConsoleBase CreateConsole()
         {
-            if (!Directory.Exists(Util.logDir()))
-            {
-                Directory.CreateDirectory(Util.logDir());
-            }
-
-            return new LogBase((Path.Combine(Util.logDir(), "export.log")), "Export", null, true);
+            return new ConsoleBase("Export", null);
         }
 
-
         private static IniConfigSource InitConfig(string[] args)
         {
             Console.WriteLine("Good");
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
index ba7af25..78ba598 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
@@ -34,6 +34,8 @@ namespace OpenSim._32BitLaunch
     {
         static void Main(string[] args)
         {
+            log4net.Config.XmlConfigurator.Configure();
+
             System.Console.WriteLine("32-bit OpenSim executor");
             System.Console.WriteLine("-----------------------");
             System.Console.WriteLine("");