pixeldrain/fnx_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix averages on admin page

Browse Source
This commit is contained in:
Wim Brand
2021-01-18 13:40:28 +01:00
parent 61235749b9
commit 63620bdd3f
3 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/include/script/admin.js
View File

@@ -174,12 +174,6 @@ function navigateTimespan(forward) {
// Load performance statistics // Load performance statistics
let last_update = new Date().getTime();
let last_local_reads = 0;
let last_local_read_size = 0;
let last_remote_reads = 0;
let last_remote_read_size = 0;
let lastOrder; let lastOrder;
function getStats(order) { function getStats(order) {
lastOrder = order lastOrder = order
@@ -193,22 +187,14 @@ function getStats(order) {
resp.stats_watcher_listeners / resp.stats_watcher_threads resp.stats_watcher_listeners / resp.stats_watcher_threads
).toPrecision(3); ).toPrecision(3);
let elapsed = (new Date().getTime() - last_update) / 1000;
document.getElementById("local_reads").innerText = resp.local_reads; document.getElementById("local_reads").innerText = resp.local_reads;
document.getElementById("local_read_size").innerText = formatDataVolume(resp.local_read_size, 4); document.getElementById("local_read_size").innerText = formatDataVolume(resp.local_read_size, 4);
document.getElementById("remote_reads").innerText = resp.remote_reads; document.getElementById("remote_reads").innerText = resp.remote_reads;
document.getElementById("remote_read_size").innerText = formatDataVolume(resp.remote_read_size, 4); document.getElementById("remote_read_size").innerText = formatDataVolume(resp.remote_read_size, 4);
document.getElementById("local_reads_rate").innerText = ((resp.local_reads - last_local_reads) / elapsed).toPrecision(4) + " / s"; document.getElementById("local_reads_rate").innerText = resp.local_reads_per_sec.toPrecision(4) + " / s";
document.getElementById("local_read_size_rate").innerText = formatDataVolume((resp.local_read_size - last_local_read_size) / elapsed, 4) + " / s"; document.getElementById("local_read_size_rate").innerText = formatDataVolume(resp.local_read_size_per_sec, 4) + " / s";
document.getElementById("remote_reads_rate").innerText = ((resp.remote_reads - last_remote_reads) / elapsed).toPrecision(4) + " / s"; document.getElementById("remote_reads_rate").innerText = resp.remote_reads_per_sec.toPrecision(4) + " / s";
document.getElementById("remote_read_size_rate").innerText = formatDataVolume((resp.remote_read_size - last_remote_read_size) / elapsed, 4) + " / s"; document.getElementById("remote_read_size_rate").innerText = formatDataVolume(resp.remote_read_size_per_sec, 4) + " / s";
last_update = new Date().getTime();
last_local_reads = resp.local_reads;
last_local_read_size = resp.local_read_size;
last_remote_reads = resp.remote_reads;
last_remote_read_size = resp.remote_read_size;
document.getElementById("db_time").innerText = printDate(new Date(resp.db_time), true, true, true); document.getElementById("db_time").innerText = printDate(new Date(resp.db_time), true, true, true);
document.getElementById("db_latency").innerText = formatNumber(resp.db_latency / 1000, 3) + " ms"; document.getElementById("db_latency").innerText = formatNumber(resp.db_latency / 1000, 3) + " ms";

3
res/include/script/dependencies/util.js
View File

@@ -68,6 +68,7 @@ function formatNumber(amt, precision) {
} }
function formatThousands(x) { function formatThousands(x) {
// Inject a space every three digits
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " "); return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, " ");
} }
@@ -86,7 +87,7 @@ function formatDataVolume(amt, precision) {
} else if (amt >= 1e3) { } else if (amt >= 1e3) {
return (amt / 1e3).toPrecision(precision) + " kB"; return (amt / 1e3).toPrecision(precision) + " kB";
} }
return amt + " B" return Math.floor(amt) + " B"
} }
const second = 1000 const second = 1000

11
res/template/home.html
View File

@@ -263,6 +263,17 @@
logging logging
</div> </div>
</div> </div>
<div>
<div class="feat_label">Bandwidth prioritization</div>
<div class="feat_normal">
Bandwidth will be throttled if the servers are
overloaded
</div>
<div class="feat_pro">
<span class="text_highlight">High priority</span>
bandwidth during times of peak usage
</div>
</div>
<div> <div>
<div class="feat_label">Online file previews</div> <div class="feat_label">Online file previews</div>
<div class="feat_pro">View image, video, audio, PDF and text files directly in your web browser</div> <div class="feat_pro">View image, video, audio, PDF and text files directly in your web browser</div>