OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: Alan Webb <alan_webb> & Dr Scofield<drscofield@xyzzyxyzzy.net> 

Disable use of log4net in script domains to avoid mono 2.4 aborts.
0.6.6-post-fixes
Dr Scofield 2009-05-18 15:32:06 +00:00
parent 2534078380
commit e1a1d38aff
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// </summary> /// </summary>
public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected IScriptEngine m_ScriptEngine; protected IScriptEngine m_ScriptEngine;
protected SceneObjectPart m_host; protected SceneObjectPart m_host;
protected uint m_localID; protected uint m_localID;
@ -8114,7 +8114,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
catch(Exception e) catch(Exception e)
{ {
m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString()); //m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString());
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
} }

40
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{ {
public class ScriptInstance : IScriptInstance public class ScriptInstance : IScriptInstance
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IScriptEngine m_Engine; private IScriptEngine m_Engine;
private IScriptWorkItem m_CurrentResult = null; private IScriptWorkItem m_CurrentResult = null;
@ -268,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); // m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly);
} }
try try
@ -278,14 +278,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_Script.InitApi(kv.Key, kv.Value); m_Script.InitApi(kv.Key, kv.Value);
} }
// m_log.Debug("[Script] Script instance created"); // // m_log.Debug("[Script] Script instance created");
part.SetScriptEvents(m_ItemID, part.SetScriptEvents(m_ItemID,
(int)m_Script.GetStateEventFlags(State)); (int)m_Script.GetStateEventFlags(State));
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[Script] Error loading script instance\n"+e.ToString()); // m_log.Error("[Script] Error loading script instance\n"+e.ToString());
return; return;
} }
@ -347,12 +347,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
} }
else else
{ {
m_log.Error("[Script] Unable to load script state: Memory limit exceeded"); // m_log.Error("[Script] Unable to load script state: Memory limit exceeded");
} }
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml);
} }
} }
else else
@ -362,7 +362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
if (presence != null && (!postOnRez)) if (presence != null && (!postOnRez))
presence.ControllingClient.SendAgentAlertMessage("Compile successful", false); presence.ControllingClient.SendAgentAlertMessage("Compile successful", false);
// m_log.ErrorFormat("[Script] Unable to load script state, file not found"); // // m_log.ErrorFormat("[Script] Unable to load script state, file not found");
} }
} }
@ -454,10 +454,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public void VarDump(Dictionary<string, object> vars) public void VarDump(Dictionary<string, object> vars)
{ {
m_log.Info("Variable dump for script "+ m_ItemID.ToString()); // m_log.Info("Variable dump for script "+ m_ItemID.ToString());
foreach (KeyValuePair<string, object> v in vars) foreach (KeyValuePair<string, object> v in vars)
{ {
m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString()); // m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString());
} }
} }
@ -474,8 +474,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{ {
if (m_CurrentResult == null) if (m_CurrentResult == null)
m_CurrentResult = m_Engine.QueueEventHandler(this); m_CurrentResult = m_Engine.QueueEventHandler(this);
else // else
m_log.Error("[Script] Tried to start a script that was already queued"); // m_log.Error("[Script] Tried to start a script that was already queued");
} }
} }
} }
@ -729,12 +729,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
} }
catch (Exception e2) // LEGIT: User Scripting catch (Exception e2) // LEGIT: User Scripting
{ {
m_log.Error("[SCRIPT]: "+ // m_log.Error("[SCRIPT]: "+
"Error displaying error in-world: " + // "Error displaying error in-world: " +
e2.ToString()); // e2.ToString());
m_log.Error("[SCRIPT]: " + // m_log.Error("[SCRIPT]: " +
"Errormessage: Error compiling script:\r\n" + // "Errormessage: Error compiling script:\r\n" +
e.ToString()); // e.ToString());
} }
} }
else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
@ -892,7 +892,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
} }
catch(Exception e) catch(Exception e)
{ {
m_log.Error("Unable to save xml\n"+e.ToString()); // m_log.Error("Unable to save xml\n"+e.ToString());
} }
//if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state"))) //if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state")))
//{ //{
@ -953,8 +953,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
} }
} }
m_log.ErrorFormat("Scripting exception:"); // m_log.ErrorFormat("Scripting exception:");
m_log.ErrorFormat(e.ToString()); // m_log.ErrorFormat(e.ToString());
return e.ToString(); return e.ToString();
} }