This commit is contained in:
Xargana 2025-05-01 10:37:56 +03:00
parent 22bebeaa06
commit 917b12bb27

View file

@ -165,7 +165,7 @@ async function checkPM2Services() {
return; return;
} }
pm2.list((err, list) => { pm2.list(async (err, list) => {
if (err) { if (err) {
console.error('Error getting PM2 process list:', err); console.error('Error getting PM2 process list:', err);
pm2.disconnect(); pm2.disconnect();
@ -173,9 +173,9 @@ async function checkPM2Services() {
return; return;
} }
// Update PM2 services status try {
list.forEach(async (process) => { // Process each PM2 service sequentially with proper async handling
// Calculate uptime correctly - pm_uptime is a timestamp, not a duration for (const process of list) {
const uptimeMs = process.pm2_env.pm_uptime ? const uptimeMs = process.pm2_env.pm_uptime ?
Date.now() - process.pm2_env.pm_uptime : Date.now() - process.pm2_env.pm_uptime :
null; null;
@ -183,17 +183,23 @@ async function checkPM2Services() {
const processName = process.name; const processName = process.name;
const isNowOnline = process.pm2_env.status === 'online'; const isNowOnline = process.pm2_env.status === 'online';
// Check previous status // Check if we've seen this process before
const wasOnline = previousPM2Status[processName]; if (previousPM2Status[processName] === undefined) {
// First time seeing this process - initialize and don't send notification
// If status changed, send notification previousPM2Status[processName] = isNowOnline;
if (wasOnline === false && isNowOnline) { console.log(`Initializing PM2 service status for ${processName}: ${isNowOnline ? 'online' : 'offline'}`);
}
// Check if status changed
else if (previousPM2Status[processName] === false && isNowOnline) {
await sendFCMNotification(`PM2 service ${processName} is back online`, 'service_online'); await sendFCMNotification(`PM2 service ${processName} is back online`, 'service_online');
} else if (wasOnline === true && !isNowOnline) { console.log(`PM2 service ${processName} changed from offline to online`);
}
else if (previousPM2Status[processName] === true && !isNowOnline) {
await sendFCMNotification(`PM2 service ${processName} is offline (status: ${process.pm2_env.status})`, 'service_offline'); await sendFCMNotification(`PM2 service ${processName} is offline (status: ${process.pm2_env.status})`, 'service_offline');
console.log(`PM2 service ${processName} changed from online to ${process.pm2_env.status}`);
} }
// Update status tracking // Update previous status
previousPM2Status[processName] = isNowOnline; previousPM2Status[processName] = isNowOnline;
// Update status object // Update status object
@ -203,11 +209,14 @@ async function checkPM2Services() {
status: process.pm2_env.status, status: process.pm2_env.status,
cpu: process.monit ? process.monit.cpu : null, cpu: process.monit ? process.monit.cpu : null,
memory: process.monit ? process.monit.memory : null, memory: process.monit ? process.monit.memory : null,
uptime: uptimeMs, // Store the uptime in milliseconds uptime: uptimeMs,
restarts: process.pm2_env.restart_time, restarts: process.pm2_env.restart_time,
lastChecked: new Date().toISOString() lastChecked: new Date().toISOString()
}; };
}); }
} catch (error) {
console.error('Error processing PM2 services:', error);
}
pm2.disconnect(); pm2.disconnect();
resolve(); resolve();