Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 09:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add free and total mem usage to info

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-10-22 17:46:12 -04:00
parent 63e07c9433
commit a7b6d0dfe5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/admin/info.js
View File

@@ -78,6 +78,8 @@ async function getNodeInfo() {
arch: os.arch(), arch: os.arch(),
release: os.release(), release: os.release(),
load: os.loadavg().map(function (load) { return load.toFixed(2); }).join(', '), load: os.loadavg().map(function (load) { return load.toFixed(2); }).join(', '),
freemem: os.freemem(),
totalmem: os.totalmem(),
}, },
nodebb: { nodebb: {
isCluster: nconf.get('isCluster'), isCluster: nconf.get('isCluster'),
@@ -91,7 +93,8 @@ async function getNodeInfo() {
data.process.cpuUsage.system /= 1000000; data.process.cpuUsage.system /= 1000000;
data.process.cpuUsage.system = data.process.cpuUsage.system.toFixed(2); data.process.cpuUsage.system = data.process.cpuUsage.system.toFixed(2);
data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024)).toFixed(2); data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024)).toFixed(2);
data.os.freemem = (data.os.freemem / 1000000).toFixed(2);
data.os.totalmem = (data.os.totalmem / 1000000).toFixed(2);
const [stats, gitInfo] = await Promise.all([ const [stats, gitInfo] = await Promise.all([
rooms.getLocalStats(), rooms.getLocalStats(),
getGitInfo(), getGitInfo(),

2
src/views/admin/development/info.tpl
View File

@@ -39,7 +39,7 @@
</td> </td>
<td>{info.git.branch}@<a href="https://github.com/NodeBB/NodeBB/commit/{info.git.hash}" target="_blank">{info.git.hashShort}</a></td> <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.user} / {info.process.cpuUsage.system}</td> <td>{info.process.cpuUsage.user} / {info.process.cpuUsage.system}</td>
<td>{info.process.memoryUsage.humanReadable} mb</td> <td>{info.process.memoryUsage.humanReadable} mb / {info.os.freemem} mb</td>
<td>{info.os.load}</td> <td>{info.os.load}</td>
<td>{info.process.uptime}</td> <td>{info.process.uptime}</td>
</tr> </tr>