diff --git a/lib/API/CliUx.js b/lib/API/CliUx.js index a5f809d3..a25f72e0 100644 --- a/lib/API/CliUx.js +++ b/lib/API/CliUx.js @@ -293,7 +293,7 @@ UX.dispAsTable = function(list, commander) { obj[key].push(l.pm2_env.restart_time ? l.pm2_env.restart_time : 0); // CPU + Memory - obj[key].push(l.monit ? (l.monit.cpu.toFixed(2) + '%') : 'N/A', l.monit ? UX.bytesToSize(l.monit.memory, 3) : 'N/A' ); + obj[key].push(l.monit ? (l.monit.cpu + '%') : 'N/A', l.monit ? UX.bytesToSize(l.monit.memory, 3) : 'N/A' ); // User if (!stacked) @@ -327,7 +327,7 @@ UX.dispAsTable = function(list, commander) { obj[key].push((l.pm2_env.pm_uptime && status == 'online') ? timeSince(l.pm2_env.pm_uptime) : 0); // CPU - obj[key].push(l.monit ? l.monit.cpu.toFixed(2) + '%' : 'N/A'); + obj[key].push(l.monit ? l.monit.cpu + '%' : 'N/A'); // Memory obj[key].push(l.monit ? UX.bytesToSize(l.monit.memory, 1) : 'N/A'); diff --git a/lib/God.js b/lib/God.js index 2067ec31..b6a64404 100644 --- a/lib/God.js +++ b/lib/God.js @@ -20,7 +20,6 @@ var numCPUs = require('os').cpus() ? require('os').cpus().length : 1; var path = require('path'); var EventEmitter2 = require('eventemitter2').EventEmitter2; var fs = require('fs'); -var pidusage = require('pidusage'); var vizion = require('vizion'); var debug = require('debug')('pm2:god'); var Utility = require('./Utility'); diff --git a/lib/God/ActionMethods.js b/lib/God/ActionMethods.js index 83665571..808170b6 100644 --- a/lib/God/ActionMethods.js +++ b/lib/God/ActionMethods.js @@ -89,7 +89,7 @@ module.exports = function(God) { pro['monit'] = { memory: stat.memory, - cpu: stat.cpu + cpu: Math.round(stat.cpu * 10) / 10 }; return pro;