Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed some formatting on windows @server command

Browse source
This commit is contained in:
Griatch 2015-03-07 22:16:26 +01:00
parent 9e8c307bc4
commit 5191ace2a1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/commands/default/system.py
View file

@ -680,7 +680,7 @@ class CmdServerLoad(MuxCommand):
if has_psutil: if has_psutil:
loadavg = psutil.cpu_percent() loadavg = psutil.cpu_percent()
_mem = psutil.virtual_memory() _mem = psutil.virtual_memory()
rmem = _mem.used rmem = _mem.used / (1000 * 1000)
vmem = "N/A on Windows" vmem = "N/A on Windows"
pmem = _mem.percent pmem = _mem.percent
rusage = "N/A on Windows" rusage = "N/A on Windows"
@ -691,9 +691,9 @@ class CmdServerLoad(MuxCommand):
return return
# Display table # Display table
loadtable = EvTable("property", "statistic", align="l") loadtable = EvTable("property", "statistic", align="l")
loadtable.add_row("Server load", "%g" % loadavg) loadtable.add_row("Total CPU load", "%g %%" % loadavg)
loadtable.add_row("Total computer memory usage","%g MB (%g%%)" % (rmem, pmem))
loadtable.add_row("Process ID", "%g" % pid), loadtable.add_row("Process ID", "%g" % pid),
loadtable.add_row("Memory usage","%g MB (%g%%)" % (rmem, pmem))
else: else:
loadtable = "Not available on Windows without 'psutil' library " \ loadtable = "Not available on Windows without 'psutil' library " \
"(install with {wpip install psutil{n)." "(install with {wpip install psutil{n)."