Changeset 12445


Ignore:
Timestamp:
06/15/15 11:57:50 (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

    r12443 r12445  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Data.Linq;
    2425using System.Linq;
    2526using System.Web.Http;
     
    7273        var activeSlaves = onlineSlaves.Where(s => s.IsAllowedToCalculate).ToList();
    7374        var calculatingSlaves = activeSlaves.Where(s => s.SlaveState == SlaveState.Calculating).ToList();
    74 
    7575        int calculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.Memory) / 1024 : 0;
    7676        int freeCalculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.FreeMemory) / 1024 : 0;
     
    128128      }
    129129      using (var db = new HiveDataContext()) {
     130        DataLoadOptions loadOptions = new DataLoadOptions();
     131        loadOptions.LoadWith<Statistics>(o => o.SlaveStatistics);
     132        db.LoadOptions = loadOptions;
     133        db.DeferredLoadingEnabled = false;
    130134        var statistics = db.Statistics.Where(s => s.Timestamp >= start && s.Timestamp <= end)
    131                                       .OrderBy(s => s.Timestamp);
     135                                      .OrderBy(s => s.Timestamp)
     136                                      .ToList();
    132137        var status = new DTO.Status {
    133138          CoreStatus = new DTO.CoreStatus(),
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js

    r12435 r12445  
    143143                    // charts are currently filled with old total/used data
    144144                    // start temporary
    145                     var usedCores = status.CoreStatus.TotalCores - status.getCoreStatus.FreeCores;
     145                    var usedCores = status.CoreStatus.TotalCores - status.CoreStatus.FreeCores;
    146146                    var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory;
    147147                    // end temporary
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/Web.config

    r12428 r12445  
    3131      </providers>
    3232    </roleManager>
    33     <compilation debug="true" targetFramework="4.5" />
     33    <compilation debug="false" targetFramework="4.5" />
    3434    <httpRuntime targetFramework="4.5" />
    3535  </system.web>
Note: See TracChangeset for help on using the changeset viewer.