Changeset 6897 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs

Timestamp:

10/10/11 15:20:01 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed bug that occurred when setting the Heartbeat Interval for a group of slaves
• slave reports HbInterval now correct on first start

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/ConfigManager.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Management;
+using HeuristicLab.Clients.Hive.SlaveCore.Properties;
 
 
@@ -51 +52 @@
     public ConfigManager(TaskManager jobManager) {
       this.jobManager = jobManager;
+      UpdateSlaveInfo();
+    }
+
+    private void UpdateSlaveInfo() {
       cpuCounter = new PerformanceCounter();
       cpuCounter.CategoryName = "Processor";
@@ -66 +71 @@
       slave.CpuSpeed = GetCpuSpeed();
       slave.FreeMemory = GetFreeMemory();
+      slave.HbInterval = (int)Settings.Default.HeartbeatInterval.TotalSeconds;
     }
 
@@ -73 +79 @@
     /// <returns>the ClientInfo object</returns>
     public Slave GetClientInfo() {
+      UpdateSlaveInfo();
       return slave;
     }