diff --git a/public/language/en-GB/admin/development/info.json b/public/language/en-GB/admin/development/info.json index 9834719daf..f7c69a1149 100644 --- a/public/language/en-GB/admin/development/info.json +++ b/public/language/en-GB/admin/development/info.json @@ -8,7 +8,7 @@ "nodejs": "nodejs", "online": "online", "git": "git", - "process-memory": "process memory", + "process-memory": "rss/heap used", "system-memory": "system memory", "used-memory-process": "Used memory by process", "used-memory-os": "Used system memory", diff --git a/src/controllers/admin/info.js b/src/controllers/admin/info.js index 3c0457cd82..14041b2ebe 100644 --- a/src/controllers/admin/info.js +++ b/src/controllers/admin/info.js @@ -92,7 +92,8 @@ async function getNodeInfo() { }, }; - data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024 * 1024)).toFixed(3); + data.process.memoryUsage.rssReadable = (data.process.memoryUsage.rss / (1024 * 1024 * 1024)).toFixed(2); + data.process.memoryUsage.heapUsedReadable = (data.process.memoryUsage.heapUsed / (1024 * 1024 * 1024)).toFixed(2); data.process.uptimeHumanReadable = humanReadableUptime(data.process.uptime); data.os.freemem = (data.os.freemem / (1024 * 1024 * 1024)).toFixed(2); data.os.totalmem = (data.os.totalmem / (1024 * 1024 * 1024)).toFixed(2); diff --git a/src/views/admin/development/info.tpl b/src/views/admin/development/info.tpl index 493e16ac93..0c4383f7a9 100644 --- a/src/views/admin/development/info.tpl +++ b/src/views/admin/development/info.tpl @@ -40,7 +40,7 @@ {info.git.branch}@{info.git.hashShort} {info.process.cpuUsage}% - {info.process.memoryUsage.humanReadable} gb + {info.process.memoryUsage.rssReadable}gb / {info.process.memoryUsage.heapUsedReadable}gb {info.os.usedmem} gb /