Node.js based forum software built for the modern web
show rss/heap in info table
Barış Soner Uşaklı13e22e41bbb3
diff --git a/public/language/en-GB/admin/development/info.json b/public/language/en-GB/admin/development/info.jsonindex 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.jsindex 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.tplindex 493e16ac93..0c4383f7a9 100644--- a/src/views/admin/development/info.tpl+++ b/src/views/admin/development/info.tpl@@ -40,7 +40,7 @@<td>{info.git.branch}@<a href="https://github.com/NodeBB/NodeBB/commit/{info.git.hash}" target="_blank">{info.git.hashShort}</a></td><td>{info.process.cpuUsage}%</td><td>- <span title="[[admin/development/info:used-memory-process]]">{info.process.memoryUsage.humanReadable} gb</span>+ <span title="[[admin/development/info:used-memory-process]]">{info.process.memoryUsage.rssReadable}gb / {info.process.memoryUsage.heapUsedReadable}gb</span></td><td><span title="[[admin/development/info:used-memory-os]]">{info.os.usedmem} gb</span> /