lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

ScriptServer fixes: Added more debug logging, mutex lock (to be extra-super-sure) on script load/unload, removed experimental Grid-scriptengine from compile because of dynamic module loader, and added random string to script filename to bypass module loader file lock.

Browse Source 
Please delete your copy of bin/ScriptEngine/OpenSim.Grid.ScriptEngine.DotNetEngine.dll.
This commit is contained in:
Tedd Hansen
2007-11-01 19:27:03 +00:00
parent 4fad66f855
commit dcf41cb683
6 changed files with 98 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+15 -8
View File
@@ -181,6 +181,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// Execute function
try
{
#if DEBUG
m_ScriptEngine.Log.Debug("ScriptEngine", "Executing event:\r\n"
+ "QIS.localID: " + QIS.localID
+ ", QIS.itemID: " + QIS.itemID
+ ", QIS.functionName: " + QIS.functionName);
#endif
m_ScriptEngine.m_ScriptManager.ExecuteEvent(QIS.localID, QIS.itemID,
QIS.functionName, QIS.param);
}
@@ -188,16 +194,17 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
{
// DISPLAY ERROR INWORLD
string text = "Error executing script function \"" + QIS.functionName + "\":\r\n";
if (e.InnerException != null)
{
//if (e.InnerException != null)
//{
// Send inner exception
text += e.InnerException.Message.ToString();
}
else
{
//}
//else
//{
text += "\r\n";
// Send normal
text += e.Message.ToString();
}
//}
try
{
if (text.Length > 1500)
@@ -214,7 +221,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
//else
//{
// T oconsole
Console.WriteLine("Unable to send text in-world:\r\n" + text);
m_ScriptEngine.Log.Error("ScriptEngine", "Unable to send text in-world:\r\n" + text);
}
}
finally
@@ -230,7 +237,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
}
catch (Exception e)
{
Console.WriteLine("Exception in EventQueueThreadLoop: " + e.ToString());
m_ScriptEngine.Log.Error("ScriptEngine", "Exception in EventQueueThreadLoop: " + e.ToString());
}
} // while
} // try