TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-07 23:30:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复在使用内存缓存时导致节点看板页为空的Bug

Browse Source
This commit is contained in:
刘祥超
2021-07-22 08:25:42 +08:00
parent 9f39cd615f
commit 0fe2bc4a54
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/views/@default/clusters/cluster/node/boards/index.js
View File

@@ -82,7 +82,7 @@ Tea.context(function () {
attackRatio = Math.round(stats[index].attackBytes * 10000 / stats[index].bytes) / 100 attackRatio = Math.round(stats[index].attackBytes * 10000 / stats[index].bytes) / 100
} }
return stats[index].day + " " + stats[index].hour + "时<br/>总流量：" + teaweb.formatBytes(stats[index].bytes) + "<br/>缓存流量：" + teaweb.formatBytes(stats[index].cachedBytes) + "<br/>缓存命中率：" + cachedRatio + "%<br/>拦截攻击流量：" + teaweb.formatBytes(stats[index].attackBytes) + "<br/>拦截比例：" + attackRatio + "%" return stats[index].day + " " + stats[index].hour + "时<br/>总流量：" + teaweb.formatBytes(stats[index].bytes) + "<br/>缓存流量：" + teaweb.formatBytes(stats[index].cachedBytes) + "<br/>缓存命中率：" + cachedRatio + "%<br/>拦截攻击流量：" + teaweb.formatBytes(stats[index].attackBytes) + "<br/>拦截比例：" + attackRatio + "%"
}) })
} }
@@ -452,10 +452,13 @@ Tea.context(function () {
this.cacheDirAvail = "" this.cacheDirAvail = ""
this.cacheDirAvailWarning = false this.cacheDirAvailWarning = false
if (this.cacheDirValues.length > 0) { if (this.cacheDirValues.length > 0) {
this.cacheDirUsed = teaweb.formatBytes(this.cacheDirValues.$last().value.dirs[0].used) let lastStat = this.cacheDirValues.$last()
this.cacheDirTotal = teaweb.formatBytes(this.cacheDirValues.$last().value.dirs[0].total) if (lastStat.value != null && lastStat.value.dirs != null && lastStat.value.dirs.length > 0) {
this.cacheDirAvail = teaweb.formatBytes(this.cacheDirValues.$last().value.dirs[0].avail) this.cacheDirUsed = teaweb.formatBytes(this.cacheDirValues.$last().value.dirs[0].used)
this.cacheDirAvailWarning = (this.cacheDirValues.$last().value.dirs[0].avail < 1024 * 1024 * 1024 * 10) this.cacheDirTotal = teaweb.formatBytes(this.cacheDirValues.$last().value.dirs[0].total)
this.cacheDirAvail = teaweb.formatBytes(this.cacheDirValues.$last().value.dirs[0].avail)
this.cacheDirAvailWarning = (this.cacheDirValues.$last().value.dirs[0].avail < 1024 * 1024 * 1024 * 10)
}
} }
this.reloadCacheDirsChart = function () { this.reloadCacheDirsChart = function () {
let axis = {unit: "%", divider: 1} let axis = {unit: "%", divider: 1}
@@ -471,7 +474,7 @@ Tea.context(function () {
return stats[args.dataIndex].time + "<br/>使用：" + teaweb.formatBytes(v.used) + "<br/>总量：" + teaweb.formatBytes(v.total) + "<br/>比例：" + (Math.ceil(v.used * 100 / v.total * 100) / 100) + "%" return stats[args.dataIndex].time + "<br/>使用：" + teaweb.formatBytes(v.used) + "<br/>总量：" + teaweb.formatBytes(v.total) + "<br/>比例：" + (Math.ceil(v.used * 100 / v.total * 100) / 100) + "%"
}, },
value: function (v) { value: function (v) {
if (v.value.dirs.length ==0) { if (v.value == null || v.value.dirs == null || v.value.dirs.length == 0) {
return 0 return 0
} }
v = v.value.dirs[0] v = v.value.dirs[0]