Changeset 4305 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

Timestamp:

08/24/10 18:37:04 (14 years ago)

Author:

cneumuel

Message:

added streamedHttpEndpoit binding (without message-security (for now)) (#1168)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/SlaveCommunicator.cs

@@ -176 +176 @@
     /// <param name="slaveInfo"></param>
     /// <returns></returns>
-    public Response Login(Guid slaveId) {
+    public Response Login(SlaveDto slave) {
       Response response = new Response();
 
       heartbeatLock.EnterWriteLock();
-      if (lastHeartbeats.ContainsKey(slaveId)) {
-        lastHeartbeats[slaveId] = DateTime.Now;
+      if (lastHeartbeats.ContainsKey(slave.Id)) {
+        lastHeartbeats[slave.Id] = DateTime.Now;
       } else {
-        lastHeartbeats.Add(slaveId, DateTime.Now);
+        lastHeartbeats.Add(slave.Id, DateTime.Now);
       }
       heartbeatLock.ExitWriteLock();
 
-      SlaveDto dbSlave = DaoLocator.SlaveDao.FindById(slaveId);
-
-      //Really set offline? 
-      //Reconnect issues with the currently calculating jobs
-      dbSlave.State = SlaveState.Idle;
-      dbSlave.CalendarSyncStatus = dbSlave != null ? dbSlave.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
+      SlaveDto dbSlave = DaoLocator.SlaveDao.FindById(slave.Id);
+
+      slave.CalendarSyncStatus = dbSlave != null ? dbSlave.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
+      slave.State = SlaveState.Idle;
 
       if (dbSlave == null)
-        DaoLocator.SlaveDao.Insert(dbSlave);
-      else
-        DaoLocator.SlaveDao.Update(dbSlave);
+        DaoLocator.SlaveDao.Insert(slave);
+      else {
+        DaoLocator.SlaveDao.Update(slave);
+      }
 
       return response;