Merge pull request #3725 from soyuka/fix-list

Fix pm2 list cpu display
Unitech · Jun 19, 2018 · a39eb4f · a39eb4f
2 parents 8545826 + 623eb78
commit a39eb4f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/API.js b/lib/API.js
@@ -566,7 +566,7 @@ class API {
         return false;
       }
 
-      return cb ? cb(null, list) : that.speedList();
+      return cb ? cb(null, list) : that.speedList(null, list);
     });
   }
 
@@ -1467,13 +1467,19 @@ class API {
    * @method speedList
    * @return
    */
-  speedList (code) {
+  speedList (code, list) {
     var that = this;
 
     // Do nothing if PM2 called programmatically and not called from CLI (also in exitCli)
     if (conf.PM2_PROGRAMMATIC && process.env.PM2_USAGE != 'CLI') return false;
 
-    that.Client.executeRemote('getMonitorData', {}, function(err, list) {
+    if (list) {
+      return doList(null, list)
+    }
+
+    that.Client.executeRemote('getMonitorData', {}, doList);
+
+    function doList(err, list) {
       if (err) {
         if (gl_retry == 0) {
           gl_retry += 1;
@@ -1510,7 +1516,7 @@ class API {
       else {
         return that.exitCli(code ? code : conf.SUCCESS_EXIT);
       }
-    });
+    }
   }
 
   /**

diff --git a/lib/API/CliUx.js b/lib/API/CliUx.js
@@ -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 + '%' : 'N/A');
+      obj[key].push(l.monit ? l.monit.cpu.toFixed(2) + '%' : 'N/A');
 
       // Memory
       obj[key].push(l.monit ? UX.bytesToSize(l.monit.memory, 1) : 'N/A');