Changeset 12789 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs

Timestamp:

07/21/15 11:48:49 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Access.DataAccess-3.3:

• Added a new method to the TaskDao

HeuristicLab.Services.Hive-3.3:

• Added NewEventManager.cs
• Updated HiveJanitor.cs
• Updated ServiceLocator.cs

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs

@@ -31 +31 @@
     private AutoResetEvent generateStatisticsWaitHandle;
 
-    private ITransactionManager trans {
-      get { return ServiceLocator.Instance.TransactionManager; }
+    private IPersistenceManager PersistenceManager {
+      get { return ServiceLocator.Instance.PersistenceManager; }
     }
-
-    private IEventManager eventManager {
+    private IEventManager EventManager {
       get { return ServiceLocator.Instance.EventManager; }
     }
 
-    private IStatisticsGenerator statisticsGenerator {
+    private IStatisticsGenerator StatisticsGenerator {
       get { return ServiceLocator.Instance.StatisticsGenerator; }
-    }
-
-    private IHiveDao dao {
-      get { return ServiceLocator.Instance.HiveDao; }
     }
 
@@ -64 +59 @@
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting cleanup.");
           bool cleanup = false;
-          trans.UseTransaction(() => {
-            DateTime lastCleanup = dao.GetLastCleanup();
-            if (DateTime.Now - lastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
-              dao.SetLastCleanup(DateTime.Now);
-              cleanup = true;
-            }
-          }, true);
-
+          using (var pm = PersistenceManager) {
+            var lifecycleDao = pm.LifecycleDao;
+            pm.UseTransaction(() => {
+              var lifecycle = lifecycleDao.GetLastLifecycle();
+              if (lifecycle == null
+                  || DateTime.Now - lifecycle.LastCleanup > HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval) {
+                lifecycleDao.UpdateLifecycle();
+                cleanup = true;
+              }
+              pm.SubmitChanges();
+            }, true);
+          }
           if (cleanup) {
-            eventManager.Cleanup();
+            EventManager.Cleanup();
           }
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: cleanup finished.");
@@ -89 +88 @@
         try {
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting generate statistics.");
-          statisticsGenerator.GenerateStatistics();
+          StatisticsGenerator.GenerateStatistics();
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: generate statistics finished.");
         }