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/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs | |
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/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs')
-rw-r--r-- | OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs index c9c0fb0..4bb74f5 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs | |||
@@ -35,13 +35,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer | |||
35 | { | 35 | { |
36 | internal class ScriptEngineLoader | 36 | internal 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 | |||
41 | public ScriptEngineLoader(LogBase logger) | ||
42 | { | ||
43 | m_log = logger; | ||
44 | } | ||
45 | 39 | ||
46 | public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName) | 40 | public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName) |
47 | { | 41 | { |
@@ -55,7 +49,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer | |||
55 | } | 49 | } |
56 | catch (Exception e) | 50 | catch (Exception e) |
57 | { | 51 | { |
58 | m_log.Error("ScriptEngine", | 52 | m_log.Error("[ScriptEngine]: " + |
59 | "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + | 53 | "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + |
60 | e.StackTrace.ToString()); | 54 | e.StackTrace.ToString()); |
61 | } | 55 | } |
@@ -87,7 +81,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer | |||
87 | //} | 81 | //} |
88 | //catch (Exception e) | 82 | //catch (Exception e) |
89 | //{ | 83 | //{ |
90 | // m_log.Error("ScriptEngine", "Error loading assembly \String.Empty + FileName + "\": " + e.ToString()); | 84 | // m_log.Error("[ScriptEngine]: Error loading assembly \String.Empty + FileName + "\": " + e.ToString()); |
91 | //} | 85 | //} |
92 | 86 | ||
93 | 87 | ||
@@ -104,7 +98,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer | |||
104 | //} | 98 | //} |
105 | //catch (Exception e) | 99 | //catch (Exception e) |
106 | //{ | 100 | //{ |
107 | // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); | 101 | // m_log.Error("[ScriptEngine]: Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); |
108 | //} | 102 | //} |
109 | 103 | ||
110 | ScriptServerInterfaces.ScriptEngine ret; | 104 | ScriptServerInterfaces.ScriptEngine ret; |
@@ -114,7 +108,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer | |||
114 | //} | 108 | //} |
115 | //catch (Exception e) | 109 | //catch (Exception e) |
116 | //{ | 110 | //{ |
117 | // m_log.Error("ScriptEngine", "Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); | 111 | // m_log.Error("[ScriptEngine]: Error initializing type \String.Empty + NameSpace + "\" from \String.Empty + FileName + "\": " + e.ToString()); |
118 | //} | 112 | //} |
119 | 113 | ||
120 | return ret; | 114 | return ret; |