Changeset 6100 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs

Timestamp:

05/02/11 17:56:52 (13 years ago)

Author:

ascheibe

Message:

#1233

• Executor now sends all exceptions to the ExperimentManager as NetNamedPipe communication won't be possible in a Sandbox due to security constraints
• count stopped and aborted jobs correctly
• send correct status when a job is stopped by the ExperimentManager
• try to log unhandled exceptions to gui if no EventLog is available
• don't crash if job is sent more than once by server

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs (modified) (6 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Executor.cs

@@ -98 +98 @@
       SendHeartbeatForExecutor = false;
       if (Job == null) {
-        SlaveClientCom.Instance.ClientCom.LogMessage("Pausing job: Job is null");
+        currentException = new Exception("Pausing job " + this.JobId + ": Job is null");
         Core.EnqueueExecutorMessage(Core.KillAppDomain, JobId);
       }
@@ -109 +109 @@
         }
         catch (Exception ex) {
-          SlaveClientCom.Instance.ClientCom.LogMessage("Error pausing job:" + ex.ToString());
+          currentException = new Exception("Error pausing job " + this.JobId + ": " + ex.ToString());
         }
       }
@@ -117 +117 @@
       SendHeartbeatForExecutor = false;
       if (Job == null) {
-        SlaveClientCom.Instance.ClientCom.LogMessage("Stopping job: Job is null");
+        currentException = new Exception("Stopping job " + this.JobId + ": Job is null");
         Core.EnqueueExecutorMessage(Core.KillAppDomain, JobId);
       }
@@ -128 +128 @@
         }
         catch (Exception ex) {
-          SlaveClientCom.Instance.ClientCom.LogMessage("Error stopping job:" + ex.ToString());
+          currentException = new Exception("Error stopping job " + this.JobId + ": " + ex.ToString());
         }
       }
@@ -207 +207 @@
     public JobData GetFinishedJob() {
       if (Job == null) {
-        SlaveClientCom.Instance.ClientCom.LogMessage("Getting finished job: Job is null");
+        if (currentException == null) {
+          currentException = new Exception("Getting finished job " + this.JobId + ": Job is null");
+        }
         Core.EnqueueExecutorMessage(Core.KillAppDomain, JobId);
       }
@@ -218 +220 @@
         }
         catch (Exception ex) {
-          SlaveClientCom.Instance.ClientCom.LogMessage("Error stopping job:" + ex.ToString());
+          currentException = new Exception("Error getting finished job " + this.JobId + ": " + ex.ToString());
         }
       }