Changeset 7166

Timestamp:

12/10/11 17:44:18 (12 years ago)

Author:

ascheibe

Message:

#1672

• don't serialize the results 2 times before uploading
• made slave a little bit more robust

Location:

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3

Files:

• Core.cs (modified) (3 diffs)
• Executor.cs (modified) (1 diff)
• Manager/HeartbeatManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -98 +98 @@
         }
         ShutdownCore();
-      }
-      finally {
+      } finally {
         DeregisterServiceEvents();
         waitShutdownSem.Release();
@@ -334 +333 @@
         if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
         task.ExecutionTime = e.Value.ExecutionTime;
-        TaskData taskData = e.Value.GetTaskData();
+        TaskData taskData = e.Value2;
         wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Paused);
       }
@@ -352 +351 @@
         if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
         task.ExecutionTime = e.Value.ExecutionTime;
-        TaskData taskData = e.Value.GetTaskData();
+        TaskData taskData = e.Value2;
         wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Finished);
       }

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs

@@ -188 +188 @@
       if (taskDataInvalid) return null;
 
-      if (task.ExecutionState == ExecutionState.Started) {
+      if (task != null && task.ExecutionState == ExecutionState.Started) {
         throw new InvalidStateException("Task is still running");
       } else {

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

@@ -82 +82 @@
     private void RunHeartBeatThread() {
       while (!threadStopped) {
-        SlaveClientCom.Instance.ClientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
+        try {
+          SlaveClientCom.Instance.ClientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
+        }
+        catch (Exception ex) {
+          EventLogManager.LogMessage("Couldn't sent status information to client ui. Exception is: " + Environment.NewLine + ex.ToString());
+        }
 
         try {