Changeset 997 for trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

Timestamp:

12/16/08 22:20:13 (16 years ago)

Author:

kgrading

Message:

improved sandbox (#410)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -45 +45 @@
 
 namespace HeuristicLab.Hive.Client.Core {
-  public class Core {
-
+  public class Core: MarshalByRefObject {
     public delegate string GetASnapshotDelegate();
 
     Dictionary<long, Executor> engines = new Dictionary<long, Executor>();
     Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
-
-    private ClientCommunicatorClient ccc;
+    
     private WcfService wcfService;
 
@@ -146 +144 @@
     void wcfService_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
       if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
-        bool sandboxed = false;
+        bool sandboxed = true;
 
         PluginManager.Manager.Initialize();
-        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));      
+        AppDomain appDomain =  PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.JobId.ToString(), sandboxed, typeof(TestJob));
+        appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
+
         appDomains.Add(e.Result.JobId, appDomain);
 
@@ -190 +190 @@
       return engines;
     }
+
+    void appDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
+      Logging.GetInstance().Error(this.ToString(), " Exception: " + e.ExceptionObject.ToString());
+    }
   }
 }