aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-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/Environment/Scenes/Scripting/ScriptEngineLoader.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs15
1 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 74f9358..b52b2e9 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -35,12 +35,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
35{ 35{
36 public class ScriptEngineLoader 36 public class ScriptEngineLoader
37 { 37 {
38 private LogBase m_log; 38 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
39
40 public ScriptEngineLoader(LogBase logger)
41 {
42 m_log = logger;
43 }
44 39
45 public ScriptEngineInterface LoadScriptEngine(string EngineName) 40 public ScriptEngineInterface LoadScriptEngine(string EngineName)
46 { 41 {
@@ -54,7 +49,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
54 } 49 }
55 catch (Exception e) 50 catch (Exception e)
56 { 51 {
57 m_log.Error("ScriptEngine", 52 m_log.Error("[ScriptEngine]: " +
58 "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + 53 "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +
59 e.StackTrace.ToString()); 54 e.StackTrace.ToString());
60 } 55 }
@@ -88,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
88 //} 83 //}
89 //catch (Exception e) 84 //catch (Exception e)
90 //{ 85 //{
91 // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString()); 86 // m_log.Error("[ScriptEngine]: Error loading assembly \String.Empty + FileName + "\": " + e.ToString());
92 //} 87 //}
93 88
94 89
@@ -105,7 +100,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
105 //} 100 //}
106 //catch (Exception e) 101 //catch (Exception e)
107 //{ 102 //{
108 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); 103 // m_log.Error("[ScriptEngine]: Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
109 //} 104 //}
110 105
111 ScriptEngineInterface ret; 106 ScriptEngineInterface ret;
@@ -115,7 +110,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
115 //} 110 //}
116 //catch (Exception e) 111 //catch (Exception e)
117 //{ 112 //{
118 // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); 113 // m_log.Error("[ScriptEngine]: Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString());
119 //} 114 //}
120 115
121 return ret; 116 return ret;