diff options
author | Jeff Ames | 2009-02-22 01:26:18 +0000 |
---|---|---|
committer | Jeff Ames | 2009-02-22 01:26:18 +0000 |
commit | 818af9d4827ea66358abbc3929d20e09861c7306 (patch) | |
tree | 097254f7d203fff8547c30061540bc01e4f84d12 /OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |
parent | Addresses some issues with appearance after TPs. Appearance.Owner was not bei... (diff) | |
download | opensim-SC-818af9d4827ea66358abbc3929d20e09861c7306.zip opensim-SC-818af9d4827ea66358abbc3929d20e09861c7306.tar.gz opensim-SC-818af9d4827ea66358abbc3929d20e09861c7306.tar.bz2 opensim-SC-818af9d4827ea66358abbc3929d20e09861c7306.tar.xz |
Refactor log4net logger handling in script engine. (#3148)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs index eeca143..d35e585 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/AppDomainManager.cs | |||
@@ -34,6 +34,7 @@ using System.Security.Policy; | |||
34 | using System.Security.Permissions; | 34 | using System.Security.Permissions; |
35 | using OpenSim.Region.ScriptEngine.Interfaces; | 35 | using OpenSim.Region.ScriptEngine.Interfaces; |
36 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 36 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
37 | using log4net; | ||
37 | 38 | ||
38 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 39 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
39 | { | 40 | { |
@@ -51,6 +52,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
51 | // 4. Unload AppDomain completely when all scripts in it has stopped | 52 | // 4. Unload AppDomain completely when all scripts in it has stopped |
52 | // | 53 | // |
53 | 54 | ||
55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
56 | |||
54 | private int maxScriptsPerAppDomain = 1; | 57 | private int maxScriptsPerAppDomain = 1; |
55 | 58 | ||
56 | // Internal list of all AppDomains | 59 | // Internal list of all AppDomains |
@@ -138,12 +141,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
138 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + | 141 | AppDomain AD = AppDomain.CreateDomain("ScriptAppDomain_" + |
139 | AppDomainNameCount, null, ads); | 142 | AppDomainNameCount, null, ads); |
140 | 143 | ||
141 | m_scriptEngine.Log.Info("[" + m_scriptEngine.ScriptEngineName + | 144 | m_log.Info("[" + m_scriptEngine.ScriptEngineName + |
142 | "]: AppDomain Loading: " + | 145 | "]: AppDomain Loading: " + |
143 | AssemblyName.GetAssemblyName( | 146 | AssemblyName.GetAssemblyName( |
144 | "OpenSim.Region.ScriptEngine.Shared.dll").ToString()); | 147 | "OpenSim.Region.ScriptEngine.Shared.dll").ToString()); |
145 | AD.Load(AssemblyName.GetAssemblyName( | 148 | AD.Load(AssemblyName.GetAssemblyName( |
146 | "OpenSim.Region.ScriptEngine.Shared.dll")); | 149 | "OpenSim.Region.ScriptEngine.Shared.dll")); |
147 | 150 | ||
148 | // Return the new AppDomain | 151 | // Return the new AppDomain |
149 | return AD; | 152 | return AD; |