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

round memory to nearest GB

Browse Source 
os.totalmem returns some close-to-GB number. Because of this two
apps with 2GB don't install on 4GB.
This commit is contained in:
girish@cloudron.io
2016-02-25 17:16:11 -08:00
parent 6b67e64bf1
commit 187d4f9ca2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webadmin/src/js/client.js
View File

@@ -764,7 +764,8 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
Client.prototype.enoughResourcesAvailable = function (app) { Client.prototype.enoughResourcesAvailable = function (app) {
var needed = app.manifest.memoryLimit || DEFAULT_MEMORY_LIMIT; var needed = app.manifest.memoryLimit || DEFAULT_MEMORY_LIMIT;
var used = this.getInstalledApps().reduce(function (prev, cur) { return prev + (cur.manifest.memoryLimit || DEFAULT_MEMORY_LIMIT); }, 0); var used = this.getInstalledApps().reduce(function (prev, cur) { return prev + (cur.manifest.memoryLimit || DEFAULT_MEMORY_LIMIT); }, 0);
var available = (this.getConfig().memory || 0) - used; var roundedMemory = Math.round(this.getConfig().memory / (1024 * 1024 * 1024)) * 1024 * 1024 * 1024; // round to nearest GB
var available = (roundedMemory || 0) - used;
return (available - needed) >= 0; return (available - needed) >= 0;
}; };