Fixed display error of server capacity by performing rounding as last step.

pull/280/head
matlorr 1 month ago
parent 52898d93e7
commit 451dc262b2

1
.gitignore vendored

@ -5,3 +5,4 @@ server/.lake
**/.DS_Store **/.DS_Store
logs/ logs/
relay/prev_cpu_metric relay/prev_cpu_metric
test.ecosystem.config.cjs

@ -193,8 +193,8 @@ function LandingPage() {
</p> </p>
</Trans> </Trans>
<p> <p>
{ usageMem >= 0 && <> {t("RAM")}: <strong>{usageMem} %</strong>{t(" used")}.<br/></> } { usageMem >= 0 && <> {t("RAM")}: <strong>{usageMem.toFixed(2)} %</strong>{t(" used")}.<br/></> }
{ usageCPU >= 0 && <> {t("CPU")}: <strong>{usageCPU} %</strong>{t(" used")}. </> } { usageCPU >= 0 && <> {t("CPU")}: <strong>{usageCPU.toFixed(2)} %</strong>{t(" used")}. </> }
</p> </p>
</div> </div>
</section> </section>

@ -3,10 +3,10 @@
# Load python interpreter # Load python interpreter
python=/usr/bin/python3 python=/usr/bin/python3
# Load python script # Load python script
cpu_usage=$L4G_DIR/lean4game/relay/cpu_usage.py cpu_usage=relay/cpu_usage.py
# Execute python script # Execute python script
cpu=$($python $cpu_usage) cpu=$($python $cpu_usage)
# Calculate memory usage by computing used_memory/total_memory # Calculate memory usage by computing used_memory/total_memory
mem=$(free | sed '2q;d' | awk '{print $3/$2}') mem=$(free | sed '2q;d' | awk '{print $3/$2}')
printf "CPU, MEM\n%.2f, %.2f\n" $cpu $mem printf "CPU, MEM\n%f, %f\n" $cpu $mem

Loading…
Cancel
Save