Browse Source

add java and tmux version and change ram to int

pull/4363/head
Daniel Gibbs 2 years ago
parent
commit
ceccf92144
No known key found for this signature in database GPG Key ID: 2076B128385E8C55
  1. 4
      lgsm/modules/info_distro.sh
  2. 9
      lgsm/modules/info_stats.sh

4
lgsm/modules/info_distro.sh

@ -168,8 +168,8 @@ if [ "$(command -v numfmt 2> /dev/null)" ]; then
fi fi
# Available RAM and swap. # Available RAM and swap.
physmemtotalmb="$(((physmemtotalkb + 512) / 1024))" # integer physmemtotalmb="$(((physmemtotalkb + 512) / 1024))" # integer # integer
physmemtotalgb="$(((physmemtotalmb + 512) / 1024))" # integer physmemtotalgb="$(((physmemtotalmb + 512) / 1024))" # integer # integer
physmemtotal="$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K")" # string physmemtotal="$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K")" # string
physmemfree="$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")" # string physmemfree="$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")" # string
physmemused="$(numfmt --to=iec --from=iec --suffix=B "$((physmemtotalkb - physmemfreekb - physmembufferskb - physmemcachedkb - physmemreclaimablekb))K")" # string physmemused="$(numfmt --to=iec --from=iec --suffix=B "$((physmemtotalkb - physmemfreekb - physmembufferskb - physmemcachedkb - physmemreclaimablekb))K")" # string

9
lgsm/modules/info_stats.sh

@ -66,12 +66,12 @@ payload="{
{ {
\"name\": \"LinuxGSM\", \"name\": \"LinuxGSM\",
\"params\": { \"params\": {
\"cpuusedmhzroundup\": \"${cpuusedmhzroundup}MHz\", \"cpuusedmhzroundup\": \"${cpuusedmhzroundup}\",
\"diskused\": \"${serverfilesdu}\", \"diskused\": \"${serverfilesdu}\",
\"distro\": \"${distroname}\", \"distro\": \"${distroname}\",
\"game\": \"${gamename}\", \"game\": \"${gamename}\",
\"memusedmbroundup\": \"${memusedmbroundup}MB\", \"memusedmbroundup\": \"${memusedmbroundup}\",
\"ramused\": \"${memusedmbroundup}MB\", \"ramused\": \"${memusedmbroundup}\",
\"servercpu\": \"${cpumodel} ${cpucores} cores\", \"servercpu\": \"${cpumodel} ${cpucores} cores\",
\"servercpufreq\": \"${cpufreqency} x${cpucores}\", \"servercpufreq\": \"${cpufreqency} x${cpucores}\",
\"serverdisk\": \"${totalspace}\", \"serverdisk\": \"${totalspace}\",
@ -83,7 +83,8 @@ payload="{
\"uuidinstance\": \"${uuidinstance}\", \"uuidinstance\": \"${uuidinstance}\",
\"version\": \"${version}\", \"version\": \"${version}\",
\"virtualenvironment\": \"${virtualenvironment}\", \"virtualenvironment\": \"${virtualenvironment}\",
\"tmuxversion\": \"${tmuxversion}\" \"tmuxversion\": \"${tmuxversion}\",
\"java\": \"${javaversion}\"
} }
} }
] ]

Loading…
Cancel
Save