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

View file

@ -156,64 +156,73 @@ async function checkServers() {
} }
async function checkPM2Services() { async function checkPM2Services() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
pm2.connect(function(err) { pm2.connect(function(err) {
if (err) { if (err) {
console.error('Error connecting to PM2:', err); console.error('Error connecting to PM2:', err);
pm2.disconnect(); pm2.disconnect();
resolve(); resolve();
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();
resolve(); resolve();
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;
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'}`);
await sendFCMNotification(`PM2 service ${processName} is back online`, 'service_online'); }
} else if (wasOnline === true && !isNowOnline) { // Check if status changed
await sendFCMNotification(`PM2 service ${processName} is offline (status: ${process.pm2_env.status})`, 'service_offline'); else if (previousPM2Status[processName] === false && isNowOnline) {
} await sendFCMNotification(`PM2 service ${processName} is back online`, 'service_online');
console.log(`PM2 service ${processName} changed from offline to online`);
// Update status tracking }
previousPM2Status[processName] = isNowOnline; else if (previousPM2Status[processName] === true && !isNowOnline) {
await sendFCMNotification(`PM2 service ${processName} is offline (status: ${process.pm2_env.status})`, 'service_offline');
// Update status object console.log(`PM2 service ${processName} changed from online to ${process.pm2_env.status}`);
pm2ServicesStatus[processName] = { }
name: processName,
id: process.pm_id, // Update previous status
status: process.pm2_env.status, previousPM2Status[processName] = isNowOnline;
cpu: process.monit ? process.monit.cpu : null,
memory: process.monit ? process.monit.memory : null, // Update status object
uptime: uptimeMs, // Store the uptime in milliseconds pm2ServicesStatus[processName] = {
restarts: process.pm2_env.restart_time, name: processName,
lastChecked: new Date().toISOString() id: process.pm_id,
}; status: process.pm2_env.status,
}); cpu: process.monit ? process.monit.cpu : null,
memory: process.monit ? process.monit.memory : null,
pm2.disconnect(); uptime: uptimeMs,
resolve(); restarts: process.pm2_env.restart_time,
}); lastChecked: new Date().toISOString()
}); };
}); }
} catch (error) {
console.error('Error processing PM2 services:', error);
}
pm2.disconnect();
resolve();
});
});
});
} }
async function checkAll() { async function checkAll() {