Skip to content

Commit 68e8675

Browse files
authored
Update FTL %cpu and %mem everytime total CPU stats are updated (#3622)
2 parents 47a9324 + 507fde4 commit 68e8675

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

scripts/js/footer.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,6 @@ function updateFtlInfo() {
261261
" regex filters are enabled"
262262
);
263263
updateQueryFrequency(intl, ftl.query_frequency);
264-
$("#sysinfo-cpu-ftl").text("(" + ftl["%cpu"].toFixed(1) + "% used by FTL)");
265-
$("#sysinfo-ram-ftl").text("(" + ftl["%mem"].toFixed(1) + "% used by FTL)");
266264
$("#sysinfo-pid-ftl").text(ftl.pid);
267265
const startdate = moment()
268266
.subtract(ftl.uptime, "milliseconds")
@@ -346,15 +344,17 @@ function updateSystemInfo() {
346344
);
347345
$("#cpu").prop(
348346
"title",
349-
"Load averages for the past 1, 5, and 15 minutes\non a system with " +
347+
"CPU usage: " +
348+
system.cpu["%cpu"].toFixed(1) +
349+
"%\nLoad averages for the past 1, 5, and 15 minutes\non a system with " +
350350
system.cpu.nprocs +
351351
" core" +
352352
(system.cpu.nprocs > 1 ? "s" : "") +
353353
" running " +
354354
system.procs +
355-
" processes " +
355+
" processes" +
356356
(system.cpu.load.raw[0] > system.cpu.nprocs
357-
? " (load is higher than the number of cores)"
357+
? "\n(load is higher than the number of cores)"
358358
: "")
359359
);
360360
$("#sysinfo-cpu").text(
@@ -368,6 +368,9 @@ function updateSystemInfo() {
368368
" processes"
369369
);
370370

371+
$("#sysinfo-cpu-ftl").text("(" + system.ftl["%cpu"].toFixed(1) + "% used by FTL)");
372+
$("#sysinfo-ram-ftl").text("(" + system.ftl["%mem"].toFixed(1) + "% used by FTL)");
373+
371374
const startdate = moment()
372375
.subtract(system.uptime, "seconds")
373376
.format("dddd, MMMM Do YYYY, HH:mm:ss");

0 commit comments

Comments
 (0)