From afaa12a9e2fd24c03c0f46716e9758cc591703c2 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Tue, 14 Aug 2007 15:59:36 +0000
Subject: ScriptEngine: Some error handling, logs to logger

---
 OpenSim/Region/Environment/Scenes/Scene.cs         |  4 +--
 .../Scenes/Scripting/ScriptEngineInterface.cs      |  2 +-
 .../Scenes/Scripting/ScriptEngineLoader.cs         | 31 +++++++++++++++++++---
 3 files changed, 30 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5123048..4254f74 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1017,10 +1017,10 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Script Engine
         private List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface> ScriptEngines = new List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface>();
-        public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine)
+        public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine, LogBase m_logger)
         {
             ScriptEngines.Add(ScriptEngine);
-            ScriptEngine.InitializeEngine(this);        
+            ScriptEngine.InitializeEngine(this, m_logger);        
         }
         #endregion
 
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index 5f378a6..510f257 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
 {
     public interface ScriptEngineInterface
     {
-        void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld);
+        void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger);
         void Shutdown();
         void StartScript(string ScriptID, string ObjectID);
     }
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 4b912e4..2c87359 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -36,14 +36,25 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
 {
     public class ScriptEngineLoader
     {
-        public ScriptEngineLoader()
+        private OpenSim.Framework.Console.LogBase m_log;
+        public ScriptEngineLoader(OpenSim.Framework.Console.LogBase logger)
         {
+            m_log = logger;
         }
 
         public ScriptEngineInterface LoadScriptEngine(string EngineName)
         {
-            return LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"), 
-                        "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
+            ScriptEngineInterface ret = null;
+            try
+            {
+                ret = LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
+                            "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
+            }
+            catch (Exception e)
+            {
+                m_log.Error("ScriptEngine", "Error loading assembly \"" + EngineName + "\": " + e.ToString());
+            }
+            return ret;
         }
 
         /// <summary>
@@ -73,6 +84,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
             //}
             //catch (Exception e)
             //{
+            //    m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
             //}
 
 
@@ -89,9 +101,20 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
             //}
             //catch (Exception e)
             //{
+            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
             //}
 
-            return (ScriptEngineInterface)Activator.CreateInstance(t);
+            ScriptEngineInterface ret;
+            //try
+            //{
+            ret = (ScriptEngineInterface)Activator.CreateInstance(t);
+            //}
+            //catch (Exception e)
+            //{
+            //    m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
+            //}
+
+            return ret;
 
 
         }
-- 
cgit v1.1