pm2-perfmonitor 2.1.4 → 2.1.6

package/lib/app.js

@@ -60,6 +60,12 @@ const cpuOverloadHistory = new Map()
 const cpuOverloadRestartHistory = new Map()
 const cpuOverloadRestartFailedHistory = new Map()
 
+/**
+ * perf 样本是否采集中
+ * @type { Map<number,boolean> }
+ */
+const perfSamplingStats = new Map()
+
 /**
  * @param {'log' | 'info' | 'error' | 'warn'} type
  *
@@ -152,11 +158,17 @@ const setCpuOverloadRestartFailedHistory = (pm_id) => {
   }
 }
 
+let isProcessCheckerRunning = false
+
 /**
  * check process
  */
 const processChecker = async () => {
+  if (isProcessCheckerRunning) return
+
   try {
+    isProcessCheckerRunning = true
+
     const apps = await listAppsAsync()
 
     for (const app of apps) {
@@ -249,6 +261,8 @@ const processChecker = async () => {
         )
 
         if (enablePerfCollection) {
+          perfSamplingStats.set(pm_id, true)
+
           await performPerfSampling({
             pid,
             moduleName: MODULE_NAME,
@@ -257,6 +271,8 @@ const processChecker = async () => {
             sampleDuration: perfSampleDuration,
             sampleFrequency: perfSampleFrequency,
           })
+
+          perfSamplingStats.delete(pm_id)
         }
 
         try {
@@ -292,6 +308,8 @@ const processChecker = async () => {
     }
   } catch (err) {
     logger('error', err)
+  } finally {
+    isProcessCheckerRunning = false
   }
 }
 
@@ -417,6 +435,23 @@ const runModule = () => {
       return res.map((v) => `[${v[0]}]:${v[1]}`).join(' ; ')
     },
   })
+
+  Probe.metric({
+    name: 'Processes in Sampling (perf)',
+    value: () => {
+      const res = []
+
+      for (const [k, v] of perfSamplingStats) {
+        if (v === true) {
+          res.push(k)
+        }
+      }
+
+      if (!res.length) return 'N/A'
+
+      return res.join(', ')
+    },
+  })
 }
 
 runModule()

package/lib/perf-sampler.js

@@ -30,7 +30,7 @@ const execCommand = async (cmd, args, options = {}) => {
 
     return true
   } catch (err) {
-    console.error(`Command failed: ${cmd} ${args.join(' ')}`, err.message)
+    console.error(`Command failed: [${cmd} ${args.join(' ')}]`, err.message)
     return false
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pm2-perfmonitor",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "A pm2 module for performance monitoring. Automatically detect zombie processes and restart it",
   "author": {
     "name": "elenh",