Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes rounding when 0.001% or less on CPU usage. (#4207)

Browse source
This commit is contained in:
VinGal 2022-07-01 01:23:27 +01:00 committed by GitHub
parent ccea09c9d9
commit cc06d1faa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/scripts/components/server/console/StatGraphs.tsx
View file

@ -16,7 +16,7 @@ export default () => {
const limits = ServerContext.useStoreState((state) => state.server.data!.limits); const limits = ServerContext.useStoreState((state) => state.server.data!.limits);
const previous = useRef<Record<'tx' | 'rx', number>>({ tx: -1, rx: -1 }); const previous = useRef<Record<'tx' | 'rx', number>>({ tx: -1, rx: -1 });
const cpu = useChartTickLabel('CPU', limits.cpu, '%'); const cpu = useChartTickLabel('CPU', limits.cpu, '%', 2);
const memory = useChartTickLabel('Memory', limits.memory, 'MB'); const memory = useChartTickLabel('Memory', limits.memory, 'MB');
const network = useChart('Network', { const network = useChart('Network', {
sets: 2, sets: 2,
@ -56,8 +56,7 @@ export default () => {
} catch (e) { } catch (e) {
return; return;
} }
cpu.push(values.cpu_absolute);
cpu.push(values.cpu_absolute.toFixed(2));
memory.push(Math.floor(values.memory_bytes / 1024 / 1024)); memory.push(Math.floor(values.memory_bytes / 1024 / 1024));
network.push([ network.push([
previous.current.tx < 0 ? 0 : Math.max(0, values.network.tx_bytes - previous.current.tx), previous.current.tx < 0 ? 0 : Math.max(0, values.network.tx_bytes - previous.current.tx),

4
resources/scripts/components/server/console/chart.ts
View file

@ -139,7 +139,7 @@ function useChart(label: string, opts?: UseChartOptions) {
return { props: { data, options }, push, clear }; return { props: { data, options }, push, clear };
} }
function useChartTickLabel(label: string, max: number, tickLabel: string) { function useChartTickLabel(label: string, max: number, tickLabel: string, roundTo?: number) {
return useChart(label, { return useChart(label, {
sets: 1, sets: 1,
options: { options: {
@ -148,7 +148,7 @@ function useChartTickLabel(label: string, max: number, tickLabel: string) {
suggestedMax: max, suggestedMax: max,
ticks: { ticks: {
callback(value) { callback(value) {
return `${value}${tickLabel}`; return `${roundTo ? Number(value).toFixed(roundTo) : value}${tickLabel}`;
}, },
}, },
}, },