From d073a1f1508377ba3c741800b19828f96884b751 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sat, 18 Feb 2017 11:44:04 +0100 Subject: [PATCH] Better error messages --- status/load.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) mode change 100644 => 100755 status/load.py diff --git a/status/load.py b/status/load.py old mode 100644 new mode 100755 index 4f642d2..55e23f9 --- a/status/load.py +++ b/status/load.py @@ -1,20 +1,25 @@ #!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# @Author: KevinMidboe +# @Date: 2017-02-15 23:45:16 +# @Last Modified by: KevinMidboe +# @Last Modified time: 2017-02-18 11:42:42 + from subprocess import check_output from re import findall from platform import system def load(): - sysName = system() + sysName = system() # Get system name if sysName == 'Linux': arpOutput = check_output("cat /proc/loadavg", shell=True) - elif sysName == 'Darwin': + elif sysName == 'Darwin': # macOS arpOutput = check_output("uptime", shell=True) else: - return {"Error": "Running OS does not supported load."} + return {"errors": "Running OS does not supported load."} arpOutput = arpOutput.decode() - return findall('[0-9]{1,2}[\.][0-9]{2}', arpOutput) - + return {"loads": findall('[0-9]{1,2}[\.][0-9]{2}', arpOutput)} if __name__ == '__main__': print(load())