claw-daemon/clawd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use total-available for mem_used, aggregate real filesystems for disk

Browse Source 
Made-with: Cursor
This commit is contained in:
stswangzhiping
2026-03-15 21:29:51 +08:00
parent f5ae8b0710
commit abf2cacac7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/metrics.js
View File

@@ -23,17 +23,20 @@ async function collect() {
? r2(load.value.currentLoad) ? r2(load.value.currentLoad)
: null; : null;
// 内存（bytes → KB） // 内存（bytes → KB）；用 total - available 反映真实占用，与 free -h 一致
const memVal = mem.status === 'fulfilled' ? mem.value : {}; const memVal = mem.status === 'fulfilled' ? mem.value : {};
const mem_total = toKB(memVal.total); const mem_total = toKB(memVal.total);
const mem_used = toKB(memVal.used); const mem_used = toKB((memVal.total || 0) - (memVal.available || 0));
// 磁盘：取挂载根目录 "/" 或第一个条目 // 磁盘：聚合所有真实挂载点，排除虚拟文件系统
const VIRTUAL_FS = new Set(['tmpfs', 'devtmpfs', 'overlay', 'squashfs', 'ramfs', 'sysfs', 'proc']);
let disk_total = null, disk_used = null; let disk_total = null, disk_used = null;
if (fsArr.status === 'fulfilled' && fsArr.value.length > 0) { if (fsArr.status === 'fulfilled' && fsArr.value.length > 0) {
const root = fsArr.value.find(f => f.mount === '/') || fsArr.value[0]; const realFs = fsArr.value.filter(f => f.size > 0 && !VIRTUAL_FS.has(f.type));
disk_total = toKB(root.size); if (realFs.length > 0) {
disk_used = toKB(root.used); disk_total = toKB(realFs.reduce((s, f) => s + f.size, 0));
disk_used = toKB(realFs.reduce((s, f) => s + f.used, 0));
}
} }
// 温度 // 温度