diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/ExtensionsScriptModule/Engines | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/ExtensionsScriptModule/Engines')
-rw-r--r-- | OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs | 6 |
2 files changed, 8 insertions, 4 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 | |||
35 | { | 35 | { |
36 | public class CSharpScriptEngine : IScriptCompiler | 36 | public class CSharpScriptEngine : IScriptCompiler |
37 | { | 37 | { |
38 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
39 | |||
38 | public string FileExt() | 40 | public string FileExt() |
39 | { | 41 | { |
40 | return ".cs"; | 42 | return ".cs"; |
@@ -58,10 +60,10 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp | |||
58 | 60 | ||
59 | if (compilerResults.Errors.Count > 0) | 61 | if (compilerResults.Errors.Count > 0) |
60 | { | 62 | { |
61 | MainLog.Instance.Error("Compile errors"); | 63 | m_log.Error("Compile errors"); |
62 | foreach (CompilerError error in compilerResults.Errors) | 64 | foreach (CompilerError error in compilerResults.Errors) |
63 | { | 65 | { |
64 | MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | 66 | m_log.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); |
65 | } | 67 | } |
66 | } | 68 | } |
67 | else | 69 | 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 | |||
35 | { | 35 | { |
36 | public class JScriptEngine : IScriptCompiler | 36 | public class JScriptEngine : IScriptCompiler |
37 | { | 37 | { |
38 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
39 | |||
38 | public string FileExt() | 40 | public string FileExt() |
39 | { | 41 | { |
40 | return ".js"; | 42 | return ".js"; |
@@ -58,10 +60,10 @@ namespace OpenSim.Region.ExtensionsScriptModule.JScript | |||
58 | 60 | ||
59 | if (compilerResults.Errors.Count > 0) | 61 | if (compilerResults.Errors.Count > 0) |
60 | { | 62 | { |
61 | MainLog.Instance.Error("Compile errors"); | 63 | m_log.Error("Compile errors"); |
62 | foreach (CompilerError error in compilerResults.Errors) | 64 | foreach (CompilerError error in compilerResults.Errors) |
63 | { | 65 | { |
64 | MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); | 66 | m_log.Error(error.Line.ToString() + ": " + error.ErrorText.ToString()); |
65 | } | 67 | } |
66 | } | 68 | } |
67 | else | 69 | else |