feat: short more info

NodeBB · Jul 21, 2020 · 23a9a33 · 23a9a33
1 parent 2c06f6a
commit 23a9a33
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/public/language/en-GB/admin/development/info.json b/public/language/en-GB/admin/development/info.json
@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

diff --git a/src/controllers/admin/info.js b/src/controllers/admin/info.js
@@ -79,6 +79,12 @@ async function getNodeInfo() {
 			release: os.release(),
 			load: os.loadavg().map(function (load) { return load.toFixed(2); }).join(', '),
 		},
+		nodebb: {
+			isCluster: nconf.get('isCluster'),
+			isPrimary: nconf.get('isPrimary'),
+			runJobs: nconf.get('runJobs'),
+			jobsDisabled: nconf.get('jobsDisabled'),
+		},
 	};
 	data.process.cpuUsage.user /= 1000000;
 	data.process.cpuUsage.user = data.process.cpuUsage.user.toFixed(2);
@@ -109,5 +115,5 @@ async function getGitInfo() {
 		getAsync('git rev-parse HEAD'),
 		getAsync('git rev-parse --abbrev-ref HEAD'),
 	]);
-	return { hash: hash, branch: branch };
+	return { hash: hash, hashShort: hash.substr(0, 6), branch: branch };
 }
diff --git a/src/views/admin/development/info.tpl b/src/views/admin/development/info.tpl
@@ -11,6 +11,7 @@
 				<thead>
 					<tr>
 						<td>[[admin/development/info:host]]</td>
+						<td class="text-center">[[admin/development/info:primary]]</td>
 						<td>[[admin/development/info:pid]]</td>
 						<td>[[admin/development/info:nodejs]]</td>
 						<td>[[admin/development/info:online]]</td>
@@ -25,14 +26,18 @@
 				<!-- BEGIN info -->
 				<tr>
 					<td>{info.os.hostname}:{info.process.port}</td>
+					<td class="text-center">
+						{{{if info.nodebb.isPrimary}}}<i class="fa fa-check"></i>{{{else}}}<i class="fa fa-times"></i>{{{end}}} /
+						{{{if info.nodebb.runJobs}}}<i class="fa fa-check"></i>{{{else}}}<i class="fa fa-times"></i>{{{end}}}
+					</td>
 					<td>{info.process.pid}</td>
 					<td>{info.process.version}</td>
 					<td>
 						<span title="[[admin/development/info:registered]]">{info.stats.onlineRegisteredCount}</span> /
 						<span title="[[admin/development/info:guests]]">{info.stats.onlineGuestCount}</span> /
 						<span title="[[admin/development/info:sockets]]">{info.stats.socketCount}</span>
 					</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.hashShort}</a></td>
 					<td>{info.process.cpuUsage.user} / {info.process.cpuUsage.system}</td>
 					<td>{info.process.memoryUsage.humanReadable} mb</td>
 					<td>{info.os.load}</td>