Show CPU and Memory usage

Author: Dahlgren

Diff for: lib/server.js

@@ -1,13 +1,16 @@
 var _ = require('lodash')
 var events = require('events')
 var fs = require('fs')
+var filesize = require('filesize')
 var Gamedig = require('gamedig')
+var usage = require('pidusage')
 var slugify = require('slugify')
 
 var ArmaServer = require('arma-server')
 
 var config = require('../config.js')
 
+var processInterval = 2000
 var queryInterval = 5000
 var queryTypes = {
   arma1: 'arma',
@@ -69,6 +72,32 @@ Server.prototype.update = function (options) {
   this.port = parseInt(this.port, 10) // If port is a string then gamedig fails
 }
 
+Server.prototype.queryProcess = function () {
+  if (!this.instance) {
+    return
+  }
+
+  var self = this
+  usage(self.instance.pid, function (err, stats) {
+    if (!self.instance) {
+      return
+    }
+
+    if (err) {
+      self.process = null
+    } else {
+      self.process = {
+        cpu: stats.cpu,
+        cpuFormatted: stats.cpu.toFixed(0) + ' %',
+        memory: stats.memory,
+        memoryFormatted: filesize(stats.memory)
+      }
+    }
+
+    self.emit('state')
+  })
+}
+
 Server.prototype.queryStatus = function () {
   if (!this.instance) {
     return
@@ -190,8 +219,10 @@ Server.prototype.start = function () {
       logStream.end()
     }
 
+    clearInterval(self.queryProcessInterval)
     clearInterval(self.queryStatusInterval)
     self.state = null
+    self.process = null
     self.pid = null
     self.instance = null
 
@@ -206,6 +237,9 @@ Server.prototype.start = function () {
 
   this.pid = instance.pid
   this.instance = instance
+  this.queryProcessInterval = setInterval(function () {
+    self.queryProcess()
+  }, processInterval)
   this.queryStatusInterval = setInterval(function () {
     self.queryStatus()
   }, queryInterval)
@@ -318,6 +352,7 @@ Server.prototype.toJSON = function () {
     persistent: this.persistent,
     pid: this.pid,
     port: this.port,
+    process: this.process,
     state: this.state,
     title: this.title,
     von: this.von,

Diff for: package.json

@@ -37,6 +37,7 @@
     "lodash": "^4.17.10",
     "morgan": "^1.8.1",
     "multer": "^1.3.0",
+    "pidusage": "^2.0.17",
     "raw-loader": "^0.5.1",
     "serve-static": "^1.12.1",
     "slugify": "^1.1.0",

Diff for: public/js/app/models/server.js

@@ -18,6 +18,7 @@ module.exports = Backbone.Model.extend({
     password: '',
     persistent: false,
     port: 2302,
+    process: null,
     state: null,
     title: '',
     von: false,

Diff for: public/js/tpl/servers/info.html

@@ -39,6 +39,22 @@
     </div>
   </div>
 
+<% if (process) { %>
+  <div class="form-group">
+    <label class="col-sm-1 control-label">CPU</label>
+    <div class="col-sm-11">
+      <p class="form-control-static"><%= process.cpuFormatted %></p>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <label class="col-sm-1 control-label">RAM</label>
+    <div class="col-sm-11">
+      <p class="form-control-static"><%= process.memoryFormatted %></p>
+    </div>
+  </div>
+<% } %>
+
 <% if (state) { %>
   <div class="form-group">
     <label class="col-sm-1 control-label">Name</label>

Diff for: public/js/tpl/servers/list.html

@@ -1,9 +1,12 @@
 <table class="table table-striped">
   <thead>
     <tr>
-      <th colspan="2">Status</th>
+      <th>Status</th>
+      <th></th>
       <th>Port</th>
       <th>Title</th>
+      <th>CPU</th>
+      <th>RAM</th>
       <th></th>
       <th></th>
     </tr>

Diff for: public/js/tpl/servers/list_item.html

@@ -21,13 +21,21 @@
     <span class="glyphicon glyphicon-play"></span> Start
   </button>
   <% } %>
-
-
 </td>
 <td><%-port%></td>
 <td style="width: 100%;">
   <a href='#servers/<%-id%>'><%-title%></a>
 </td>
+<td class="text-nowrap">
+  <% if (process) { %>
+    <%= process.cpuFormatted %>
+  <% } %>
+</td>
+<td class="text-nowrap">
+  <% if (process) { %>
+    <%= process.memoryFormatted %></td>
+  <% } %>
+</td>
 <td>
   <button type="button" class="btn btn-success btn-xs clone pull-right">
     <span class="glyphicon glyphicon-plus-sign"></span> Clone