Changeset 12445

Timestamp:

06/15/15 11:57:50 (9 years ago)

Author:

dglaser

Message:

#2394:
Changed Web.config compilation from debug to release to force script bundling.
Changed history loading type from lazy to eager loading to increase performance.
Fixed "getCoreStatus" typo in statusCtrl.js

Location:

trunk/sources

Files:

• HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs (modified) (3 diffs)
• HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/Web.config (modified) (1 diff)

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Linq;
 using System.Linq;
 using System.Web.Http;
@@ -72 +73 @@
         var activeSlaves = onlineSlaves.Where(s => s.IsAllowedToCalculate).ToList();
         var calculatingSlaves = activeSlaves.Where(s => s.SlaveState == SlaveState.Calculating).ToList();
-
         int calculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.Memory) / 1024 : 0;
         int freeCalculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.FreeMemory) / 1024 : 0;
@@ -128 +128 @@
       }
       using (var db = new HiveDataContext()) {
+        DataLoadOptions loadOptions = new DataLoadOptions();
+        loadOptions.LoadWith<Statistics>(o => o.SlaveStatistics);
+        db.LoadOptions = loadOptions;
+        db.DeferredLoadingEnabled = false;
         var statistics = db.Statistics.Where(s => s.Timestamp >= start && s.Timestamp <= end)
-                                      .OrderBy(s => s.Timestamp);
+                                      .OrderBy(s => s.Timestamp)
+                                      .ToList();
         var status = new DTO.Status {
           CoreStatus = new DTO.CoreStatus(),

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js

@@ -143 +143 @@
                     // charts are currently filled with old total/used data
                     // start temporary
-                    var usedCores = status.CoreStatus.TotalCores - status.getCoreStatus.FreeCores;
+                    var usedCores = status.CoreStatus.TotalCores - status.CoreStatus.FreeCores;
                     var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory;
                     // end temporary

trunk/sources/HeuristicLab.Services.WebApp/3.3/Web.config

@@ -31 +31 @@
       </providers>
     </roleManager>
-    <compilation debug="true" targetFramework="4.5" />
+    <compilation debug="false" targetFramework="4.5" />
     <httpRuntime targetFramework="4.5" />
   </system.web>