Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7166


Ignore:
Timestamp:
12/10/11 17:44:18 (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

    r6998 r7166  
    9898        }
    9999        ShutdownCore();
    100       }
    101       finally {
     100      } finally {
    102101        DeregisterServiceEvents();
    103102        waitShutdownSem.Release();
     
    334333        if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
    335334        task.ExecutionTime = e.Value.ExecutionTime;
    336         TaskData taskData = e.Value.GetTaskData();
     335        TaskData taskData = e.Value2;
    337336        wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Paused);
    338337      }
     
    352351        if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
    353352        task.ExecutionTime = e.Value.ExecutionTime;
    354         TaskData taskData = e.Value.GetTaskData();
     353        TaskData taskData = e.Value2;
    355354        wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Finished);
    356355      }
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Executor.cs

    r7164 r7166  
    188188      if (taskDataInvalid) return null;
    189189
    190       if (task.ExecutionState == ExecutionState.Started) {
     190      if (task != null && task.ExecutionState == ExecutionState.Started) {
    191191        throw new InvalidStateException("Task is still running");
    192192      } else {
  • trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

    r6983 r7166  
    8282    private void RunHeartBeatThread() {
    8383      while (!threadStopped) {
    84         SlaveClientCom.Instance.ClientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
     84        try {
     85          SlaveClientCom.Instance.ClientCom.StatusChanged(ConfigManager.Instance.GetStatusForClientConsole());
     86        }
     87        catch (Exception ex) {
     88          EventLogManager.LogMessage("Couldn't sent status information to client ui. Exception is: " + Environment.NewLine + ex.ToString());
     89        }
    8590
    8691        try {
Note: See TracChangeset for help on using the changeset viewer.