Changeset 5078 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

12/09/10 13:55:41 (14 years ago)

Author:

cneumuel

Message:

#1233

• removed dash from solution file name
• reorganized MessageContainer.MessageTypes
• added server test project

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4

Files:

• Hive.cs (modified) (1 diff)
• HiveService.cs (modified) (1 diff)
• app.config (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/Hive.cs

@@ -129 +129 @@
       Slave slave = dao.GetSlave(heartbeat.SlaveId);
       if (slave == null) {
-        actions.Add(new MessageContainer(MessageContainer.MessageType.AddSlaveInfo));
+        actions.Add(new MessageContainer(MessageContainer.MessageType.SayHello));
       } else {
         heartbeats[heartbeat.SlaveId] = DateTime.Now;
         actions.AddRange(UpdateJobs(heartbeat));
 
-        //check if new Cal must be loaded
-        if (slave.CalendarSyncState == CalendarState.Fetch || slave.CalendarSyncState == CalendarState.ForceFetch) {
-          actions.Add(new MessageContainer(MessageContainer.MessageType.UpdateCalendar));
-        }
-
         if (this.IsAllowedToSendJobs() && slave.IsAllowedToCalculate && heartbeat.FreeCores > 0) {
           var availableJobs = dao.GetWaitingJobs(slave);
           if (availableJobs.Count() > 0) {
-            actions.Add(new MessageContainer(MessageContainer.MessageType.FetchJob));
+            actions.Add(new MessageContainer(MessageContainer.MessageType.AquireJob));
           }
         }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -17 +17 @@
   /// Implementation of the Hive service (interface <see cref="IHiveService"/>).
   /// </summary>
-  [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
   public class HiveService : IHiveService {
     private DataAccess.IHiveDao dao {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/app.config

@@ -63 +63 @@
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:9000/Hive-3.3" />
+            <add baseAddress="http://localhost:9000/Hive-3.4" />
           </baseAddresses>
         </host>