Changeset 7255 for branches/RegressionBenchmarks/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

01/02/12 11:40:31 (12 years ago)

Author:

sforsten

Message:

#1708: merged r7209 from trunk

• adjusted GUI
• added toggle for the different series
• X Axis labels are rounded to useful values
• added ToolTip

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (2 diffs)

branches/RegressionBenchmarks/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -396 +396 @@
     public List<MessageContainer> Heartbeat(Heartbeat heartbeat) {
       authen.AuthenticateForAnyRole(HiveRoles.Slave);
-      TriggerEventManager(false);
-      return trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
+
+      List<MessageContainer> result = trans.UseTransaction(() => heartbeatManager.ProcessHeartbeat(heartbeat));
+
+      if (HeuristicLab.Services.Hive.Properties.Settings.Default.TriggerEventManagerInHeartbeat) {
+        TriggerEventManager(false);
+      }
+
+      return result;
     }
     #endregion
@@ -559 +565 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Slave);
       // use a serializable transaction here to ensure not two threads execute this simultaniously (mutex-lock would not work since IIS may use multiple AppDomains)
+      bool cleanup = false;
       trans.UseTransaction(() => {
         DateTime lastCleanup = dao.GetLastCleanup();
-        if (force || DateTime.Now - lastCleanup > TimeSpan.FromSeconds(59)) {
+        if (force || DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
           dao.SetLastCleanup(DateTime.Now);
-          eventManager.Cleanup();
+          cleanup = true;
         }
       }, true);
+
+      if (cleanup) {
+        eventManager.Cleanup();
+      }
     }
     #endregion