From 8c55604c1d8a39a7db3f6c404e9d775793210e04 Mon Sep 17 00:00:00 2001 From: Nyo Date: Thu, 9 Jun 2016 10:51:13 +0200 Subject: [PATCH] .BANCHO. .FIX. Fixed and edited !system status --- constants/fokabotCommands.py | 14 +++++++------- helpers/systemHelper.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/constants/fokabotCommands.py b/constants/fokabotCommands.py index d9a7267..5cdfbb6 100644 --- a/constants/fokabotCommands.py +++ b/constants/fokabotCommands.py @@ -307,18 +307,18 @@ def systemStatus(fro, chan, message): data = systemHelper.getSystemInfo() # Final message - msg = "=== PEP.PY STATS ===\n" - msg += "Running pep.py server\n" - msg += "Webserver: {}\n".format(data["webServer"]) + msg = "pep.py bancho server v{}\n".format(glob.VERSION) + msg += "made by the Ripple team\n" msg += "\n" msg += "=== BANCHO STATS ===\n" - msg += "Connected users: {}\n".format(str(data["connectedUsers"])) + msg += "Connected users: {}\n".format(data["connectedUsers"]) + msg += "Multiplayer matches: {}\n".format(data["matches"]) msg += "\n" msg += "=== SYSTEM STATS ===\n" - msg += "CPU: {}%\n".format(str(data["cpuUsage"])) - msg += "RAM: {}GB/{}GB\n".format(str(data["usedMemory"]), str(data["totalMemory"])) + msg += "CPU: {}%\n".format(data["cpuUsage"]) + msg += "RAM: {}GB/{}GB\n".format(data["usedMemory"], data["totalMemory"]) if data["unix"] == True: - msg += "Load average: {}/{}/{}\n".format(str(data["loadAverage"][0]), str(data["loadAverage"][1]), str(data["loadAverage"][2])) + msg += "Load average: {}/{}/{}\n".format(data["loadAverage"][0], data["loadAverage"][1], data["loadAverage"][2]) return msg diff --git a/helpers/systemHelper.py b/helpers/systemHelper.py index 9518aeb..a1b5b80 100644 --- a/helpers/systemHelper.py +++ b/helpers/systemHelper.py @@ -75,7 +75,7 @@ def getSystemInfo(): # General stats data["connectedUsers"] = len(glob.tokens.tokens) - data["webServer"] = glob.conf.config["server"]["server"] + data["matches"] = len(glob.matches.matches) data["cpuUsage"] = psutil.cpu_percent() data["totalMemory"] = "{0:.2f}".format(psutil.virtual_memory()[0]/1074000000) data["usedMemory"] = "{0:.2f}".format(psutil.virtual_memory()[3]/1074000000)