ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor log4net logger handling in script engine. (#3148)

Browse Source
This commit is contained in:
Jeff Ames
2009-02-22 01:26:18 +00:00
parent 99b051ccbe
commit 818af9d482
18 changed files with 141 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/ScriptEngine/Engines/DotNetEngine/DotNetEngine.cs
View File

@@ -96,7 +96,6 @@ namespace OpenSim.ScriptEngine.Engines.DotNetEngine
RegionInfo.Executors = new Dictionary<string, IScriptExecutor>();
RegionInfo.CommandProviders = new Dictionary<string, IScriptCommandProvider>();
RegionInfo.EventProviders = new Dictionary<string, IScriptEventProvider>();
RegionInfo.Logger = LogManager.GetLogger("SECS.DotNetEngine.RegionInfo");
}
public void Initialise(Scene scene, IConfigSource source)

1
OpenSim/ScriptEngine/Shared/RegionInfoStructure.cs
View File

@@ -48,7 +48,6 @@ namespace OpenSim.ScriptEngine.Shared
public Dictionary<string, IScriptCompiler> Compilers;
public Dictionary<string, IScriptScheduler> Schedulers;
public Dictionary<string, IScriptCommandProvider> CommandProviders;
public ILog Logger;
public void Executors_Execute(EventParams p)
{

12
OpenSim/ScriptEngine/Shared/ScriptStructure.cs
View File

@@ -29,6 +29,7 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using log4net;
using OpenMetaverse;
using OpenSim.Region.ScriptEngine.Interfaces;
using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
@@ -38,6 +39,8 @@ namespace OpenSim.ScriptEngine.Shared
{
public struct ScriptStructure
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public RegionInfoStructure RegionInfo;
public ScriptMetaData ScriptMetaData;
@@ -91,8 +94,7 @@ namespace OpenSim.ScriptEngine.Shared
if (!InternalFunctions.ContainsKey(FunctionName))
{
// TODO: Send message in-world
//RegionInfo.Scene.
RegionInfo.Logger.ErrorFormat("[{0}] Script function \"{1}\" was not found.", Name, FunctionName);
m_log.ErrorFormat("[{0}] Script function \"{1}\" was not found.", Name, FunctionName);
return;
}
@@ -103,7 +105,7 @@ namespace OpenSim.ScriptEngine.Shared
}
catch (Exception e)
{
RegionInfo.Logger.ErrorFormat("[{0}] Execute \"{1}\" failed: {2}", Name, FunctionName, e.ToString());
m_log.ErrorFormat("[{0}] Execute \"{1}\" failed: {2}", Name, FunctionName, e.ToString());
}
}
}
@@ -126,8 +128,8 @@ namespace OpenSim.ScriptEngine.Shared
if (!InternalFunctions.ContainsKey(mi.Name))
InternalFunctions.Add(mi.Name, Delegate.CreateDelegate(scriptObjectType, ScriptObject, mi));
else
RegionInfo.Logger.ErrorFormat("[{0}] Error: Script function \"{1}\" is already added. We do not support overloading.",
Name, mi.Name);
m_log.ErrorFormat("[{0}] Error: Script function \"{1}\" is already added. We do not support overloading.",
Name, mi.Name);
}
}
}