From 5191ace2a11ca9400a51a8cc0adfd81ca397bd90 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 7 Mar 2015 22:16:26 +0100 Subject: [PATCH] fixed some formatting on windows @server command --- evennia/commands/default/system.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py index d457e4adc0..2d586c5437 100644 --- a/evennia/commands/default/system.py +++ b/evennia/commands/default/system.py @@ -680,7 +680,7 @@ class CmdServerLoad(MuxCommand): if has_psutil: loadavg = psutil.cpu_percent() _mem = psutil.virtual_memory() - rmem = _mem.used + rmem = _mem.used / (1000 * 1000) vmem = "N/A on Windows" pmem = _mem.percent rusage = "N/A on Windows" @@ -691,9 +691,9 @@ class CmdServerLoad(MuxCommand): return # Display table 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("Memory usage","%g MB (%g%%)" % (rmem, pmem)) else: loadtable = "Not available on Windows without 'psutil' library " \ "(install with {wpip install psutil{n)."