Changeset 17825 for branches/3040_VectorBasedGP/HeuristicLab.Services.Hive.JanitorService/3.3/JanitorService.cs

Timestamp:

01/27/21 14:10:56 (4 years ago)

Author:

pfleck

Message:

#3040 Merged trunk into branch.

Location:

branches/3040_VectorBasedGP

Files:

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

branches/3040_VectorBasedGP/HeuristicLab.Services.Hive.JanitorService/3.3/JanitorService.cs

@@ -26 +26 @@
   public partial class JanitorService : ServiceBase {
     private HiveJanitor janitor;
-    private Thread janitorCleanupThread;
-    private Thread janitorGenerateStatisticsThread;
+    private Thread janitorThread;
 
     public JanitorService() {
@@ -36 +35 @@
       janitor = new HiveJanitor();
 
-      janitorCleanupThread = new Thread(janitor.RunCleanup) {
-        IsBackground = true
-      };
-      janitorGenerateStatisticsThread = new Thread(janitor.RunGenerateStatistics) {
+      janitorThread = new Thread(janitor.Run) {
         IsBackground = true
       };
 
-      janitorCleanupThread.Start();
-      janitorGenerateStatisticsThread.Start();
+      janitorThread.Start();
     }
 
     protected override void OnStop() {
       janitor.StopJanitor();
-      janitorCleanupThread.Join();
-      janitorGenerateStatisticsThread.Join();
+      janitorThread.Join();
     }
   }