worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2021-02-27 11:18:56 +09:00
parent 06e817af59 55face52d8
commit 34fef37e54
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -186,7 +186,7 @@
"multer": "1.4.2", "multer": "1.4.2",
"nested-property": "4.0.0", "nested-property": "4.0.0",
"node-fetch": "2.6.1", "node-fetch": "2.6.1",
"nodemailer": "6.4.18", "nodemailer": "6.5.0",
"object-assign-deep": "0.4.0", "object-assign-deep": "0.4.0",
"os-utils": "0.0.14", "os-utils": "0.0.14",
"p-cancelable": "2.0.0", "p-cancelable": "2.0.0",

4
src/client/widgets/server-metric/cpu-mem.vue
View file

@ -120,7 +120,7 @@ export default defineComponent({
if (this.stats.length > 50) this.stats.shift(); if (this.stats.length > 50) this.stats.shift();
const cpuPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - s.cpu) * this.viewBoxY]); const cpuPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - s.cpu) * this.viewBoxY]);
const memPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - (s.mem.used / this.meta.mem.total)) * this.viewBoxY]); const memPolylinePoints = this.stats.map((s, i) => [this.viewBoxX - ((this.stats.length - 1) - i), (1 - (s.mem.active / this.meta.mem.total)) * this.viewBoxY]);
this.cpuPolylinePoints = cpuPolylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' '); this.cpuPolylinePoints = cpuPolylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' ');
this.memPolylinePoints = memPolylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' '); this.memPolylinePoints = memPolylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' ');
@ -133,7 +133,7 @@ export default defineComponent({
this.memHeadY = memPolylinePoints[memPolylinePoints.length - 1][1]; this.memHeadY = memPolylinePoints[memPolylinePoints.length - 1][1];
this.cpuP = (stats.cpu * 100).toFixed(0); this.cpuP = (stats.cpu * 100).toFixed(0);
this.memP = (stats.mem.used / this.meta.mem.total * 100).toFixed(0); this.memP = (stats.mem.active / this.meta.mem.total * 100).toFixed(0);
}, },
onStatsLog(statsLog) { onStatsLog(statsLog) {
for (const stats of [...statsLog].reverse()) { for (const stats of [...statsLog].reverse()) {

6
src/client/widgets/server-metric/mem.vue
View file

@ -45,10 +45,10 @@ export default defineComponent({
}, },
methods: { methods: {
onStats(stats) { onStats(stats) {
this.usage = stats.mem.used / this.meta.mem.total; this.usage = stats.mem.active / this.meta.mem.total;
this.total = this.meta.mem.total; this.total = this.meta.mem.total;
this.used = stats.mem.used; this.used = stats.mem.active;
this.free = this.meta.mem.total - stats.mem.used; this.free = this.meta.mem.total - stats.mem.active;
}, },
bytes bytes
} }

2
src/daemons/server-stats.ts
View file

@ -28,7 +28,7 @@ export default function() {
const stats = { const stats = {
cpu: roundCpu(cpu), cpu: roundCpu(cpu),
mem: { mem: {
used: round(memStats.used), used: round(memStats.used - memStats.buffers - memStats.cached),
active: round(memStats.active), active: round(memStats.active),
}, },
net: { net: {

8
yarn.lock
View file

@ -6995,10 +6995,10 @@ node-releases@^1.1.70:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
nodemailer@6.4.18: nodemailer@6.5.0:
version "6.4.18" version "6.5.0"
resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.18.tgz#2788c85792844fc17befda019031609017f4b9a1" resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.5.0.tgz#d12c28d8d48778918e25f1999d97910231b175d9"
integrity sha512-ht9cXxQ+lTC+t00vkSIpKHIyM4aXIsQ1tcbQCn5IOnxYHi81W2XOaU66EQBFFpbtzLEBTC94gmkbD4mGZQzVpA== integrity sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==
nofilter@^2.0.0: nofilter@^2.0.0:
version "2.0.0" version "2.0.0"