Changeset 12931 for branches/crossvalidation-2434/HeuristicLab.Services.Hive.JanitorService

Timestamp:

09/02/15 13:16:18 (9 years ago)

Author:

gkronber

Message:

#2434 merged r12878:12927 from trunk to branch (hive changes)

Location:

branches/crossvalidation-2434

Files:

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

branches/crossvalidation-2434/HeuristicLab.Services.Hive.JanitorService/3.3/HeuristicLab.Services.Hive.JanitorService-3.3.csproj

@@ -124 +124 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Services.Access.DataAccess\3.3\HeuristicLab.Services.Access.DataAccess-3.3.csproj">
+      <Project>{0f652437-998a-4eab-8bf1-444b5fe8ce97}</Project>
+      <Name>HeuristicLab.Services.Access.DataAccess-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Services.Access\3.3\HeuristicLab.Services.Access-3.3.csproj">
+      <Project>{9fac0b23-2730-452a-9ba0-d7ca1746c541}</Project>
+      <Name>HeuristicLab.Services.Access-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Services.Hive.DataAccess\3.3\HeuristicLab.Services.Hive.DataAccess-3.3.csproj">
       <Project>{EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}</Project>

branches/crossvalidation-2434/HeuristicLab.Services.Hive.JanitorService/3.3/JanitorService.cs

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