Changeset 5790 for branches/HeuristicLab.Hive-3.4/sources

Timestamp:

03/22/11 14:35:12 (14 years ago)

Author:

ascheibe

Message:

#1233 don't save the unique machine id

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4

Files:

• ConfigManager.cs (modified) (3 diffs)
• WcfService.cs (modified) (1 diff)

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

@@ -24 +24 @@
 using System.Diagnostics;
 using System.Management;
-using HeuristicLab.Clients.Hive.SlaveCore.Properties;
 
 
@@ -122 +121 @@
 
     public static Guid GetUniqueMachineId() {
-      if (Settings.Default.Guid == Guid.Empty) {
-        Guid id;
-        try {
-          id = GetUniqueMachineIdFromMac();
-        }
-        catch {
-          // fallback if something goes wrong...        
-          id = Guid.NewGuid();
-        }
-
-        Settings.Default.Guid = id;
-        Settings.Default.Save();
-        return id;
-      } else
-        return Settings.Default.Guid;
+      Guid id;
+      try {
+        id = GetUniqueMachineIdFromMac();
+      }
+      catch {
+        // fallback if something goes wrong...        
+        id = new Guid(Environment.MachineName.GetHashCode(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+      }
+      return id;
     }
 
@@ -163 +156 @@
     ///  D1      D2  D3  Res.   D4
     /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    /// |0 0 0 0|0 0|0 0|0 0 mac address|
+    /// |n a m e|0 0|0 0|0 0 mac address|
     /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     /// 
     /// The mac address is saved in the last 48 bits of the Data 4 segment 
     /// of the guid (first 2 bytes of Data 4 are reserved).
+    /// D1 contains the name of the machine. 
     /// </summary>    
     private static Guid GetUniqueMachineIdFromMac() {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/WcfService.cs

@@ -101 +101 @@
 
     public Job UpdateJobState(Guid jobId, JobState jobState, string exception) {
-      return CallHiveService(s => s.UpdateJobState(jobId, jobState, ConfigManager.GetUniqueMachineId(), null, exception));
+      return CallHiveService(s => s.UpdateJobState(jobId, jobState, ConfigManager.Instance.GetClientInfo().Id, null, exception));
     }
     #endregion