jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

services: use memorySwap to be consistent with the app memory UI

Browse Source 
the memory limit sliders take the total memory (memory + swap).
This commit is contained in:
Girish Ramakrishnan
2020-01-28 13:34:08 -08:00
parent c5d14195d6
commit 4a29fa93c5
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/system.js
View File

@@ -89,7 +89,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
$scope.serviceConfigure.reset();
$scope.serviceConfigure.service = service;
$scope.serviceConfigure.memoryLimit = service.config.memory;
$scope.serviceConfigure.memoryLimit = service.config.memorySwap; // memory + swap
// TODO improve those
$scope.serviceConfigure.memoryTicks = [];
@@ -109,7 +109,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
$scope.serviceConfigure.busy = true;
$scope.serviceConfigure.error = null;
Client.configureService($scope.serviceConfigure.service.name, memoryLimit, function (error) {
Client.configureService($scope.serviceConfigure.service.name, { memorySwap: memoryLimit, memory: memoryLimit/2 }, function (error) {
$scope.serviceConfigure.busy = false;
if (error) {
$scope.serviceConfigure.error = error.message;