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.

6 files changed, 29 insertions, 18 deletions

diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
index b625f43..03d478f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
@@ -35,6 +35,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp
 {
     public class CSharpScriptEngine : IScriptCompiler
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         public string FileExt()
         {
             return ".cs";
@@ -58,10 +60,10 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp
 
             if (compilerResults.Errors.Count > 0)
             {
-                MainLog.Instance.Error("Compile errors");
+                m_log.Error("Compile errors");
                 foreach (CompilerError error in compilerResults.Errors)
                 {
-                    MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
+                    m_log.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
                 }
             }
             else
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
index bc5c413..dbe0dca 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
@@ -35,6 +35,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JScript
 {
     public class JScriptEngine : IScriptCompiler
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         public string FileExt()
         {
             return ".js";
@@ -58,10 +60,10 @@ namespace OpenSim.Region.ExtensionsScriptModule.JScript
 
             if (compilerResults.Errors.Count > 0)
             {
-                MainLog.Instance.Error("Compile errors");
+                m_log.Error("Compile errors");
                 foreach (CompilerError error in compilerResults.Errors)
                 {
-                    MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
+                    m_log.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());
                 }
             }
             else
diff --git a/OpenSim/Region/ExtensionsScriptModule/Script.cs b/OpenSim/Region/ExtensionsScriptModule/Script.cs
index 0555277..d9d569b 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Script.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Script.cs
@@ -53,12 +53,12 @@ namespace OpenSim.Region.ExtensionsScriptModule
 
         private void events_OnNewPresence(ScenePresence presence)
         {
-            script.logger.Verbose("TESTSCRIPT", "Hello " + presence.Firstname.ToString() + "!");
+            script.Log.Info("[TESTSCRIPT]: Hello " + presence.Firstname.ToString() + "!");
         }
 
         private void events_OnFrame()
         {
-            //script.logger.Verbose("TESTSCRIPT", "Hello World!");
+            //script.logger.Info("[TESTSCRIPT]: Hello World!");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
index af54a4e..e90bfc1 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
@@ -36,23 +36,26 @@ namespace OpenSim.Region.ExtensionsScriptModule
     /// </summary>
     public class ScriptInfo
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         // Reference to world.eventsManager provided for convenience
         public EventManager events;
 
         // The main world
         public Scene world;
 
-        // The console
-        public LogBase logger;
-
         // API Access
         public ScriptAPI api;
 
+        public log4net.ILog Log
+        {
+            get { return m_log; }
+        }
+
         public ScriptInfo(Scene scene)
         {
             world = scene;
             events = world.EventManager;
-            logger = MainLog.Instance;
             api = new ScriptAPI(world, LLUUID.Zero);
         }
 
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
index b3a0d4f..0f50358 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
@@ -45,6 +45,8 @@ namespace OpenSim.Region.ExtensionsScriptModule
     /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks>
     internal class ScriptInterpretedAPI
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         protected Key m_object;
         protected Scene m_scene;
 
@@ -109,7 +111,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
             {
                 //Dont do anything!
             }
-            MainLog.Instance.Warn("script",
+            m_log.Warn("[script]: " +
                                   "Unimplemented function called by script: osAddToLandPassList(Key avatar, float hours)");
             return;
         }
@@ -117,7 +119,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
         [Obsolete("Unimplemented")]
         public void osAdjustSoundVolume(float volume)
         {
-            MainLog.Instance.Warn("script", "Unimplemented function called by script: osAdjustSoundVolume(float volume)");
+            m_log.Warn("[script]: Unimplemented function called by script: osAdjustSoundVolume(float volume)");
             return;
         }
 
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index d080ab8..6c2d940 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -38,6 +38,8 @@ namespace OpenSim.Region.ExtensionsScriptModule
 {
     public class ScriptManager : IRegionModule, IExtensionScriptModule
     {
+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         private readonly List<IScript> scripts = new List<IScript>();
         private Scene m_scene;
         private readonly Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();
@@ -48,12 +50,12 @@ namespace OpenSim.Region.ExtensionsScriptModule
             {
                 ScriptInfo scriptInfo = new ScriptInfo(m_scene);
                 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
-                MainLog.Instance.Verbose("SCRIPT", "Loading " + script.Key);
+                m_log.Info("[SCRIPT]: Loading " + script.Key);
                 script.Value.Initialise(scriptInfo);
                 scripts.Add(script.Value);
             }
 
-            MainLog.Instance.Verbose("SCRIPT", string.Format("Finished loading {0} script(s)", compiledscripts.Count));
+            m_log.Info("[SCRIPT]: " + string.Format("Finished loading {0} script(s)", compiledscripts.Count));
         }
 
         public ScriptManager()
@@ -71,7 +73,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
 
         public void Initialise(Scene scene, IConfigSource config)
         {
-            MainLog.Instance.Verbose("SCRIPTMODULE", "Initialising Extensions Scripting Module");
+            m_log.Info("[SCRIPTMODULE]: Initialising Extensions Scripting Module");
             m_scene = scene;
 
             m_scene.RegisterModuleInterface<IExtensionScriptModule>(this);
@@ -118,14 +120,14 @@ namespace OpenSim.Region.ExtensionsScriptModule
                     break;
 
                 default:
-                    MainLog.Instance.Error("Unknown script command");
+                    m_log.Error("Unknown script command");
                     break;
             }
         }
 
         public bool AddPreCompiledScript(IScript script)
         {
-            MainLog.Instance.Verbose("SCRIPT", "Loading script " + script.Name);
+            m_log.Info("[SCRIPT]: Loading script " + script.Name);
             ScriptInfo scriptInfo = new ScriptInfo(m_scene);
             // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
             script.Initialise(scriptInfo);