From dcf41cb68370dc1e1b03fd78edf75b175b17f6ea Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Thu, 1 Nov 2007 19:27:03 +0000
Subject: 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. Please
 delete your copy of
 bin/ScriptEngine/OpenSim.Grid.ScriptEngine.DotNetEngine.dll.

---
 .../ScriptEngine/DotNetEngine/EventQueueManager.cs | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs')

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index d7491d9..f215dd5 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -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
-- 
cgit v1.1