Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add process cpu usage to admin

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-02-28 14:50:31 -05:00
parent 684175f7d7
commit db47753877
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/language/en-GB/admin/development/info.json
View File

@@ -7,7 +7,8 @@
"online": "online", "online": "online",
"git": "git", "git": "git",
"memory": "memory", "memory": "memory",
"load": "load", "load": "system load",
"cpu-usage": "cpu usage",
"uptime": "uptime", "uptime": "uptime",
"registered": "Registered", "registered": "Registered",

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

@@ -65,6 +65,7 @@ function getNodeInfo(callback) {
version: process.version, version: process.version,
memoryUsage: process.memoryUsage(), memoryUsage: process.memoryUsage(),
uptime: process.uptime(), uptime: process.uptime(),
cpuUsage: process.cpuUsage(),
}, },
os: { os: {
hostname: os.hostname(), hostname: os.hostname(),
@@ -75,7 +76,8 @@ function getNodeInfo(callback) {
load: os.loadavg().map(function (load) { return load.toFixed(2); }).join(', '), load: os.loadavg().map(function (load) { return load.toFixed(2); }).join(', '),
}, },
}; };
data.process.cpuUsage.user /= 1000;
data.process.cpuUsage.system /= 1000;
data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024)).toFixed(2); data.process.memoryUsage.humanReadable = (data.process.memoryUsage.rss / (1024 * 1024)).toFixed(2);
async.waterfall([ async.waterfall([

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

@@ -15,6 +15,7 @@
<td>[[admin/development/info:nodejs]]</td> <td>[[admin/development/info:nodejs]]</td>
<td>[[admin/development/info:online]]</td> <td>[[admin/development/info:online]]</td>
<td>[[admin/development/info:git]]</td> <td>[[admin/development/info:git]]</td>
<td>[[admin/development/info:cpu-usage]]</td>
<td>[[admin/development/info:memory]]</td> <td>[[admin/development/info:memory]]</td>
<td>[[admin/development/info:load]]</td> <td>[[admin/development/info:load]]</td>
<td>[[admin/development/info:uptime]]</td> <td>[[admin/development/info:uptime]]</td>
@@ -32,6 +33,7 @@
<span title="[[admin/development/info:sockets]]">{info.stats.socketCount}</span> <span title="[[admin/development/info:sockets]]">{info.stats.socketCount}</span>
</td> </td>
<td>{info.git.branch}@<a href="https://github.com/NodeBB/NodeBB/commit/{info.git.hash}" target="_blank">{info.git.hash}</a></td> <td>{info.git.branch}@<a href="https://github.com/NodeBB/NodeBB/commit/{info.git.hash}" target="_blank">{info.git.hash}</a></td>
<td>{info.process.cpuUsage.user} / {info.process.cpuUsage.system}</td>
<td>{info.process.memoryUsage.humanReadable} mb</td> <td>{info.process.memoryUsage.humanReadable} mb</td>
<td>{info.os.load}</td> <td>{info.os.load}</td>
<td>{info.process.uptime}</td> <td>{info.process.uptime}</td>