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

read ratio from swap-ratio

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-01-20 20:05:39 -08:00
parent 4d482d11ee
commit 7660e90d51
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/paths.js
+2
View File
@@ -60,6 +60,8 @@ exports = module.exports = {
GHOST_USER_FILE: path.join(baseDir(), 'platformdata/cloudron_ghost.json'), GHOST_USER_FILE: path.join(baseDir(), 'platformdata/cloudron_ghost.json'),
SWAP_RATIO_FILE: path.join(baseDir(), 'platformdata/swap-ratio'),
// this pattern is for the cloudron logs API route to work // this pattern is for the cloudron logs API route to work
BACKUP_LOG_FILE: path.join(baseDir(), 'platformdata/logs/backup/app.log'), BACKUP_LOG_FILE: path.join(baseDir(), 'platformdata/logs/backup/app.log'),
UPDATER_LOG_FILE: path.join(baseDir(), 'platformdata/logs/updater/app.log'), UPDATER_LOG_FILE: path.join(baseDir(), 'platformdata/logs/updater/app.log'),
src/system.js
+6 -1
View File
@@ -166,7 +166,12 @@ function getMemory(callback) {
} }
function getMemoryAllocation(limit) { function getMemoryAllocation(limit) {
let ratio = parseFloat(safe.fs.readFileSync(paths.SWAP_RATIO_FILE, 'utf8'), 10);
if (!ratio) {
const pc = os.totalmem() / (os.totalmem() + getSwapSize()); const pc = os.totalmem() / (os.totalmem() + getSwapSize());
const ratio = Math.round(pc * 10) / 10; // a simple ratio ratio = Math.round(pc * 10) / 10; // a simple ratio
}
return Math.round(Math.round(limit * ratio) / 1048576) * 1048576; // nearest MB return Math.round(Math.round(limit * ratio) / 1048576) * 1048576; // nearest MB
} }