Changeset 946

Timestamp:

12/10/08 14:57:31 (16 years ago)

Author:

kgrading

Message:

fixed the heartbeat (#346)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

@@ -30 +30 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Hive.Client.Core.ConfigurationManager;
 //using BO = HeuristicLab.Hive.Contracts.BusinessObjects;
 
@@ -70 +71 @@
     void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {
       Console.WriteLine("tick");
-      HeartBeatData heartBeatData = new HeartBeatData { ClientId = Guid.NewGuid(), 
-                                                              freeCores = 4, 
+      ClientInfo info = ConfigManager.Instance.GetClientInfo();
+      HeartBeatData heartBeatData = new HeartBeatData { ClientId = info.ClientId, 
+                                                              freeCores = info.NrOfCores, 
                                                               freeMemory = 1000, 
-                                                              jobProgress = 1};
+                                                              jobProgress = ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed};
       if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
         wcfService.Connect();