Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/07/08 16:14:00 (15 years ago)
Author:
kgrading
Message:

refactoring of the WCF Service for the Server (#418)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

    r798 r923  
    4848    }
    4949
    50     private ClientCommunicatorClient clientCommunicator;
     50    private WcfService wcfService;
    5151
    5252    /// <summary>
     
    5858      heartbeatTimer.AutoReset = true;
    5959      heartbeatTimer.Elapsed += new ElapsedEventHandler(heartbeatTimer_Elapsed);
    60       clientCommunicator = ServiceLocator.GetClientCommunicator();
    61       clientCommunicator.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(ClientCommunicator_SendHeartBeatCompleted);
     60      wcfService = WcfService.Instance;
     61      wcfService.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(wcfService_SendHeartBeatCompleted);
    6262      heartbeatTimer.Start();
    6363    }
     
    7474                                                              freeMemory = 1000,
    7575                                                              jobProgress = 1};
    76       clientCommunicator.SendHeartBeatAsync(heartBeatData);
     76      if (wcfService.ConnState == WcfService.ConnectionState.failed) {
     77        wcfService.Connect();
     78      } else if (wcfService.ConnState == WcfService.ConnectionState.connected) {
     79        wcfService.SendHeartBeatAsync(heartBeatData);
     80      }
    7781    }
    7882
    79     void ClientCommunicator_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
     83    void wcfService_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
    8084      System.Diagnostics.Debug.WriteLine("Heartbeat received! ");
    8185      e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
Note: See TracChangeset for help on using the changeset viewer.