Changeset 12776 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs

Timestamp:

07/17/15 16:57:22 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive-3.3:

• HiveStatisticsGenerator.cs: Jobs that are deleted are now automatically marked as completed in the hive statistics tables. This was added because when a job got paused and deleted afterwards, it would still show up as ongoing job in the hive statistics.
• Minor changes in NewHiveService.cs

HeuristicLab.Services.WebApp.Statistics-3.3:

• Expired slaves are now shown as offline (previously the last known state was shown)
• Adjusted dialog height

HeuristicLab.Services.WebApp-3.3:

• Changed string.Format to Path.Combine to concate directory paths

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs

@@ -83 +83 @@
                     UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                     CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                    State = clientInfo.SlaveState.ToString(),
+                    State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                     LastUpdate = clientInfo.Time,
                     GroupId = client.ResourceGroupId,
@@ -132 +132 @@
                          UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                          CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                         State = clientInfo.SlaveState.ToString(),
+                         State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                          GroupId = client.ResourceGroupId,
                          GroupName = client.GroupName,
@@ -218 +218 @@
                          UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                          CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                         State = clientInfo.SlaveState.ToString(),
+                         State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                          GroupId = client.ResourceGroupId,
                          GroupName = client.GroupName,