Changeset 12866 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager

Timestamp:

08/17/15 15:14:04 (9 years ago)

Author:

ascheibe

Message:

#2388 some more cleanups

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs (modified) (4 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Manager/EventManager.cs

@@ -34 +34 @@
     public void Cleanup() {
       var pm = PersistenceManager;
-      // same transactions as the old EventManager
       pm.UseTransaction(() => {
         SetTimeoutSlavesOffline(pm);
@@ -57 +56 @@
         if (!slave.LastHeartbeat.HasValue ||
             (DateTime.Now - slave.LastHeartbeat.Value) >
-            HeuristicLab.Services.Hive.Properties.Settings.Default.SlaveHeartbeatTimeout) {
+            Properties.Settings.Default.SlaveHeartbeatTimeout) {
           slave.SlaveState = SlaveState.Offline;
         }
@@ -88 +87 @@
     private void SetTimeoutTasksWaiting(IPersistenceManager pm) {
       var taskDao = pm.TaskDao;
-      var tasks = taskDao.GetAll().Where(x => (x.State == TaskState.Calculating && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.CalculatingJobHeartbeatTimeout)
-                                           || (x.State == TaskState.Transferring && (DateTime.Now - x.LastHeartbeat) > HeuristicLab.Services.Hive.Properties.Settings.Default.TransferringJobHeartbeatTimeout));
+      var tasks = taskDao.GetAll().Where(x => (x.State == TaskState.Calculating && (DateTime.Now - x.LastHeartbeat) > Properties.Settings.Default.CalculatingJobHeartbeatTimeout)
+                                           || (x.State == TaskState.Transferring && (DateTime.Now - x.LastHeartbeat) > Properties.Settings.Default.TransferringJobHeartbeatTimeout));
       foreach (var task in tasks) {
         task.State = TaskState.Waiting;
@@ -112 +111 @@
         .Where(x => x.IsDisposable.GetValueOrDefault()
                  && x.SlaveState == SlaveState.Offline
-                 && (DateTime.Now - x.LastHeartbeat) > Hive.Properties.Settings.Default.SweepInterval)
+                 && (DateTime.Now - x.LastHeartbeat) > Properties.Settings.Default.SweepInterval)
         .Select(x => x.ResourceId)
         .ToList();