Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/20/11 11:45:18 (12 years ago)
Author:
gkronber
Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:
branches/HeuristicLab.TimeSeries
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TimeSeries

  • branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

    r6998 r7213  
    4747    private Semaphore waitShutdownSem = new Semaphore(0, 1);
    4848    private bool abortRequested;
    49     private ISlaveCommunication clientCom;
    5049    private ServiceHost slaveComm;
    5150    private WcfService wcfService;
    … …  
    7776        slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
    7877        slaveComm.Open();
    79         clientCom = SlaveClientCom.Instance.ClientCom;
    80 
     78       
    8179        // delete all left over task directories
    8280        pluginManager.CleanPluginTemp();
    83         clientCom.LogMessage("Hive Slave started");
     81        SlaveClientCom.Instance.LogMessage("Hive Slave started");
    8482
    8583        wcfService = WcfService.Instance;
    … …  
    9391          EventLogManager.LogException(ex);
    9492        } else {
    95           //try to log with clientCom. if this works the user sees at least a message,
     93          //try to log with SlaveClientCom.Instance. if this works the user sees at least a message,
    9694          //else an exception will be thrown anyways.
    97           clientCom.LogMessage(string.Format("Uncaught exception: {0} {1} Core is going to shutdown.", ex.ToString(), Environment.NewLine));
     95          SlaveClientCom.Instance.LogMessage(string.Format("Uncaught exception: {0} {1} Core is going to shutdown.", ex.ToString(), Environment.NewLine));
    9896        }
    9997        ShutdownCore();
    100       }
    101       finally {
     98      } finally {
    10299        DeregisterServiceEvents();
    103100        waitShutdownSem.Release();
    … …  
    119116        DetermineAction(container);
    120117        if (!abortRequested) {
    121           clientCom.StatusChanged(configManager.GetStatusForClientConsole());
     118          SlaveClientCom.Instance.StatusChanged(configManager.GetStatusForClientConsole());
    122119        }
    123120      }
    … …  
    135132
    136133    private void WcfService_ExceptionOccured(object sender, EventArgs<Exception> e) {
    137       clientCom.LogMessage(string.Format("Connection to server interruped with exception: {0}", e.Value.Message));
     134      SlaveClientCom.Instance.LogMessage(string.Format("Connection to server interruped with exception: {0}", e.Value.Message));
    138135    }
    139136
    140137    private void WcfService_Connected(object sender, EventArgs e) {
    141       clientCom.LogMessage("Connected successfully to Hive server");
     138      SlaveClientCom.Instance.LogMessage("Connected successfully to Hive server");
    142139    }
    143140
    … …  
    147144    /// <param name="container">The container, containing the message</param>
    148145    private void DetermineAction(MessageContainer container) {
    149       clientCom.LogMessage(string.Format("Message: {0} for task: {1} ", container.Message.ToString(), container.TaskId));
     146      SlaveClientCom.Instance.LogMessage(string.Format("Message: {0} for task: {1} ", container.Message.ToString(), container.TaskId));
    150147
    151148      switch (container.Message) {
    … …  
    196193      .ContinueWith((t) => {
    197194        SlaveStatusInfo.IncrementExceptionOccured();
    198         clientCom.LogMessage(t.Exception.ToString());
     195        SlaveClientCom.Instance.LogMessage(t.Exception.ToString());
    199196      }, TaskContinuationOptions.OnlyOnFaulted);
    200197    }
    … …  
    204201       .ContinueWith((t) => {
    205202         SlaveStatusInfo.IncrementExceptionOccured();
    206          clientCom.LogMessage(t.Exception.ToString());
     203         SlaveClientCom.Instance.LogMessage(t.Exception.ToString());
    207204       }, TaskContinuationOptions.OnlyOnFaulted);
    208205    }
    … …  
    212209       .ContinueWith((t) => {
    213210         SlaveStatusInfo.IncrementExceptionOccured();
    214          clientCom.LogMessage(t.Exception.ToString());
     211         SlaveClientCom.Instance.LogMessage(t.Exception.ToString());
    215212       }, TaskContinuationOptions.OnlyOnFaulted);
    216213    }
    … …  
    220217       .ContinueWith((t) => {
    221218         SlaveStatusInfo.IncrementExceptionOccured();
    222          clientCom.LogMessage(t.Exception.ToString());
     219         SlaveClientCom.Instance.LogMessage(t.Exception.ToString());
    223220       }, TaskContinuationOptions.OnlyOnFaulted);
    224221    }
    … …  
    334331        if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
    335332        task.ExecutionTime = e.Value.ExecutionTime;
    336         TaskData taskData = e.Value.GetTaskData();
     333        TaskData taskData = e.Value2;
    337334        wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Paused);
    338335      }
    339336      catch (TaskNotFoundException ex) {
    340         clientCom.LogMessage(ex.ToString());
     337        SlaveClientCom.Instance.LogMessage(ex.ToString());
    341338      }
    342339      catch (Exception ex) {
    343         clientCom.LogMessage(ex.ToString());
     340        SlaveClientCom.Instance.LogMessage(ex.ToString());
    344341      }
    345342    }
    … …  
    352349        if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
    353350        task.ExecutionTime = e.Value.ExecutionTime;
    354         TaskData taskData = e.Value.GetTaskData();
     351        TaskData taskData = e.Value2;
    355352        wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Finished);
    356353      }
    357354      catch (TaskNotFoundException ex) {
    358         clientCom.LogMessage(ex.ToString());
     355        SlaveClientCom.Instance.LogMessage(ex.ToString());
    359356      }
    360357      catch (Exception ex) {
    361         clientCom.LogMessage(ex.ToString());
     358        SlaveClientCom.Instance.LogMessage(ex.ToString());
    362359      }
    363360    }
    … …  
    379376          wcfService.UpdateJobState(task.Id, TaskState.Failed, exception.ToString());
    380377        }
    381         clientCom.LogMessage(exception.Message);
     378        SlaveClientCom.Instance.LogMessage(exception.Message);
    382379      }
    383380      catch (TaskNotFoundException ex) {
    384381        SlaveStatusInfo.IncrementExceptionOccured();
    385         clientCom.LogMessage(ex.ToString());
     382        SlaveClientCom.Instance.LogMessage(ex.ToString());
    386383      }
    387384      catch (Exception ex) {
    388385        SlaveStatusInfo.IncrementExceptionOccured();
    389         clientCom.LogMessage(ex.ToString());
     386        SlaveClientCom.Instance.LogMessage(ex.ToString());
    390387      }
    391388    }
    … …  
    395392      SlaveStatusInfo.IncrementExceptionOccured();
    396393      heartbeatManager.AwakeHeartBeatThread();
    397       clientCom.LogMessage(string.Format("Exception occured for task {0}: {1}", e.Value.TaskId, e.Value2.ToString()));
     394      SlaveClientCom.Instance.LogMessage(string.Format("Exception occured for task {0}: {1}", e.Value.TaskId, e.Value2.ToString()));
    398395      wcfService.UpdateJobState(e.Value.TaskId, TaskState.Waiting, e.Value2.ToString());
    399396    }
    … …  
    407404    private void log_MessageAdded(object sender, EventArgs<string> e) {
    408405      try {
    409         clientCom.LogMessage(e.Value.Split('\t')[1]);
     406        SlaveClientCom.Instance.LogMessage(e.Value.Split('\t')[1]);
    410407      }
    411408      catch { }
    … …  
    417414    /// </summary>
    418415    private void DoAbortAll() {
    419       clientCom.LogMessage("Aborting all jobs.");
     416      SlaveClientCom.Instance.LogMessage("Aborting all jobs.");
    420417      foreach (Guid taskId in taskManager.TaskIds) {
    421418        AbortTaskAsync(taskId);
    … …  
    427424    /// </summary>
    428425    private void DoPauseAll() {
    429       clientCom.LogMessage("Pausing all jobs.");
     426      SlaveClientCom.Instance.LogMessage("Pausing all jobs.");
    430427      foreach (Guid taskId in taskManager.TaskIds) {
    431428        PauseTaskAsync(taskId);
    … …  
    437434    /// </summary>
    438435    private void DoStopAll() {
    439       clientCom.LogMessage("Stopping all jobs.");
     436      SlaveClientCom.Instance.LogMessage("Stopping all jobs.");
    440437      foreach (Guid taskId in taskManager.TaskIds) {
    441438        StopTaskAsync(taskId);
    … …  
    457454    /// </summary>
    458455    private void ShutdownCore() {
    459       clientCom.LogMessage("Shutdown signal received");
    460       clientCom.LogMessage("Stopping heartbeat");
     456      SlaveClientCom.Instance.LogMessage("Shutdown signal received");
     457      SlaveClientCom.Instance.LogMessage("Stopping heartbeat");
    461458      heartbeatManager.StopHeartBeat();
    462459      abortRequested = true;
    … …  
    464461      DoAbortAll();
    465462
    466       clientCom.LogMessage("Logging out");
     463      SlaveClientCom.Instance.LogMessage("Logging out");
    467464      WcfService.Instance.Disconnect();
    468       clientCom.Shutdown();
     465      SlaveClientCom.Instance.ClientCom.Shutdown();
    469466      SlaveClientCom.Close();
    470467
    … …  
    478475    /// </summary> 
    479476    private void DoStartSlave() {
    480       clientCom.LogMessage("Restart received");
     477      SlaveClientCom.Instance.LogMessage("Restart received");
    481478      configManager.Asleep = false;
    482479    }
    … …  
    487484    /// </summary>   
    488485    private void Sleep() {
    489       clientCom.LogMessage("Sleep received - not accepting any new jobs");
     486      SlaveClientCom.Instance.LogMessage("Sleep received - not accepting any new jobs");
    490487      configManager.Asleep = true;
    491488      DoPauseAll();
Note: See TracChangeset for help on using the changeset viewer.