admin/nexus-terminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 统一处理 BusyBox 环境下 free 命令的内存单位

Browse Source 
Related to #16
This commit is contained in:
Baobhan Sith
2025-05-06 22:17:51 +08:00
parent ddb07ae1a4
commit 88041b404f
1 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/src/services/status-monitor.service.ts
+43 -14
View File
@@ -155,32 +155,61 @@ export class StatusMonitorService {
try { try {
const freeOutput = await this.executeSshCommand(sshClient, 'free -m'); let freeCommand = 'free -m';
let isBusyBox = false;
try {
const busyboxCheck = await this.executeSshCommand(sshClient, 'busybox --help');
if (busyboxCheck.includes('BusyBox')) {
freeCommand = 'free';
isBusyBox = true;
}
} catch (err) {
// 如果检查失败，默认使用 free -m
}
const freeOutput = await this.executeSshCommand(sshClient, freeCommand);
const lines = freeOutput.split('\n'); const lines = freeOutput.split('\n');
const memLine = lines.find(line => line.startsWith('Mem:')); const memLine = lines.find(line => line.startsWith('Mem:'));
const swapLine = lines.find(line => line.startsWith('Swap:')); const swapLine = lines.find(line => line.startsWith('Swap:'));
if (memLine) { if (memLine) {
const parts = memLine.split(/\s+/); const parts = memLine.split(/\s+/);
if (parts.length >= 4) { if (parts.length >= 3) {
const total = parseInt(parts[1], 10); let totalVal = parseInt(parts[1], 10);
const used = parseInt(parts[2], 10); let usedVal = parseInt(parts[2], 10);
if (!isNaN(total) && !isNaN(used)) {
status.memTotal = total; status.memUsed = used; if (isBusyBox) {
status.memPercent = total > 0 ? parseFloat(((used / total) * 100).toFixed(1)) : 0; if (!isNaN(totalVal)) totalVal = Math.round(totalVal / 1024);
if (!isNaN(usedVal)) usedVal = Math.round(usedVal / 1024);
}
if (!isNaN(totalVal) && !isNaN(usedVal)) {
status.memTotal = totalVal;
status.memUsed = usedVal;
status.memPercent = totalVal > 0 ? parseFloat(((usedVal / totalVal) * 100).toFixed(1)) : 0;
} }
} }
} }
if (swapLine) { if (swapLine) {
const parts = swapLine.split(/\s+/); const parts = swapLine.split(/\s+/);
if (parts.length >= 4) { if (parts.length >= 3) {
const total = parseInt(parts[1], 10); let totalVal = parseInt(parts[1], 10);
const used = parseInt(parts[2], 10); let usedVal = parseInt(parts[2], 10);
if (!isNaN(total) && !isNaN(used)) {
status.swapTotal = total; status.swapUsed = used; if (isBusyBox) {
status.swapPercent = total > 0 ? parseFloat(((used / total) * 100).toFixed(1)) : 0; if (!isNaN(totalVal)) totalVal = Math.round(totalVal / 1024);
if (!isNaN(usedVal)) usedVal = Math.round(usedVal / 1024);
}
if (!isNaN(totalVal) && !isNaN(usedVal)) {
status.swapTotal = totalVal;
status.swapUsed = usedVal;
status.swapPercent = totalVal > 0 ? parseFloat(((usedVal / totalVal) * 100).toFixed(1)) : 0;
} }
} }
} else { status.swapTotal = 0; status.swapUsed = 0; status.swapPercent = 0; } } else {
status.swapTotal = 0;
status.swapUsed = 0;
status.swapPercent = 0;
}
} catch (err) { /* 静默处理 */ } } catch (err) { /* 静默处理 */ }