Changeset 1655

Timestamp:

04/24/09 14:35:35 (16 years ago)

Author:

kgrading

Message:

added proper exception handling (#601)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/3.2/Core.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj (modified) (1 diff)
• HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.2/MessageContainer.cs (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.2/Job.cs (modified) (1 diff)
• HeuristicLab.Hive.JobBase/3.2/Interfaces/IJob.cs (modified) (1 diff)
• HeuristicLab.Hive.JobBase/3.2/JobBase.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (2 diffs)

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

@@ -211 +211 @@
           files.AddRange(plugininfo.PluginFiles);
         
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(Engine.HiveEngine), files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
         lock (engines) {                    
@@ -298 +298 @@
 
     void appDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
-      Logging.Instance.Error(this.ToString(), " Exception: " + e.ExceptionObject.ToString());
+      Logging.Instance.Error(this.ToString(), "Exception in AppDomain: " + e.ExceptionObject.ToString());
+      
     }
   }

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj

@@ -143 +143 @@
       <Name>HeuristicLab.Hive.Contracts-3.2</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Hive.Engine\3.2\HeuristicLab.Hive.Engine-3.2.csproj">
+      <Project>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</Project>
+      <Name>HeuristicLab.Hive.Engine-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.2\HeuristicLab.Hive.JobBase-3.2.csproj">
       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>

trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/3.2/Executor.cs

@@ -57 +57 @@
       //Job = new TestJob();
       Job.JobStopped += new EventHandler(Job_JobStopped);
+      Job.JobFailed += new EventHandler(Job_JobFailed);
       Job.Start();
+    }
+
+    void Job_JobFailed(object sender, EventArgs e) {
+      Queue.AddMessage(new MessageContainer(MessageContainer.MessageType.JobFailed, JobId));
     }
 

trunk/sources/HeuristicLab.Hive.Contracts/3.2/MessageContainer.cs

@@ -33 +33 @@
   public class MessageContainer {
 
-    public enum MessageType { FetchJob, AbortJob, JobAborted, RequestSnapshot, FinishedJob, NoMessage, SnapshotReady, Shutdown };
+    public enum MessageType { FetchJob, AbortJob, JobAborted, RequestSnapshot, FinishedJob, NoMessage, SnapshotReady, Shutdown, JobFailed };
 
     public MessageType Message { get; set; }

trunk/sources/HeuristicLab.Hive.Engine/3.2/Job.cs

@@ -60 +60 @@
 
     public event EventHandler JobStopped;
+    public event EventHandler JobFailed;
 
     public long JobId {

trunk/sources/HeuristicLab.Hive.JobBase/3.2/Interfaces/IJob.cs

@@ -4 +4 @@
   public interface IJob: IStorable {
     event EventHandler JobStopped;
+    event EventHandler JobFailed;
     long JobId { get; set; }
     double Progress { get; }

trunk/sources/HeuristicLab.Hive.JobBase/3.2/JobBase.cs

@@ -34 +34 @@
     private Thread thread = null;
     public event EventHandler JobStopped;
+    public event EventHandler JobFailed;
     
     public long JobId { get; set; }    
@@ -42 +43 @@
 
     abstract public void Run();
+    private void SecureRun() {
+      try {
+        Run();
+      }
+      catch (Exception ex) {
+        if (JobFailed != null)
+          JobFailed(this, new EventArgs());
+      }
+    }
 
     public void Start() {
-      thread = new Thread(new ThreadStart(Run));
+      thread = new Thread(new ThreadStart(Run));      
       thread.Start();
       Running = true;

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -194 +194 @@
       PermissionSet pset;
 
+      
+
       DiscoveryService dService = new DiscoveryService();
       //get the declaring plugin of the job
@@ -227 +229 @@
       NotifyListeners(PluginManagerAction.Initializing, "All plugins");
 
-      if (assemblyFiles != null && assemblyFiles.Count > 0)
-        remoteRunner.LoadPlugins(assemblyFiles);
-    
-      //if (depPlugins != null && depPlugins.Count > 0) {        
-      //  remoteRunner.LoadPlugins(depPlugins);
-      //}
+      //if (assemblyFiles != null && assemblyFiles.Count > 0)
+      //  remoteRunner.LoadPlugins(assemblyFiles);
+      
+      if (depPlugins != null && depPlugins.Count > 0) {        
+        remoteRunner.LoadPlugins(depPlugins);
+      }
       NotifyListeners(PluginManagerAction.Initialized, "All plugins");
       return applicationDomain;