diff --git a/topstat.py b/topstat.py index d2f8a05..4e5d550 100644 --- a/topstat.py +++ b/topstat.py @@ -60,16 +60,16 @@ def runtopstat(): # Access the captured output as a string output = result.stdout - loadaverages = re.search("load averages.*", output).group() - loadaverages = re.sub("load averages.", "", loadaverages.strip()) - loadaverages = re.sub("up.*", "", loadaverages.strip()).split() + loadaverages = re.search("^last.*", output, re.MULTILINE).group() + loadaverages = re.sub("up.*", "", loadaverages.strip()) + loadaverages = re.sub("^.*load averages.", "", loadaverages.strip()).split() loadaverage1 = loadaverages[0] loadaverage5 = loadaverages[1] loadaverage15 = loadaverages[2] - processes = re.search("last.*", output).group() - processes = re.sub("processes.", "", processes.strip()) + processes = re.search("^.*processes", output).group() + processes = re.sub("^.*processes.", "", processes.strip()) processes = re.sub("[a-z,]", "", processes.strip()).split() total_processes = processes[0]