will/pinger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing logic and regex bugs in Mac

Browse Source
This commit is contained in:
user901423 2017-03-13 04:19:24 -07:00
parent a36bbeadaa
commit 68ddf9d239
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ping.inc.py
View File

@ -116,9 +116,9 @@ class Util:
) )
pingOut, pingError = ping.communicate() pingOut, pingError = ping.communicate()
# Doing two regexes because Python doesn't like doing both in one # Doing two regexes because Python doesn't like doing both in one
lossResult = re.search(r' ([0-9]+)% packet loss', pingOut, re.MULTILINE) lossResult = re.search(r' ([\d\.]+)% packet loss', pingOut, re.MULTILINE)
rttAvgResult = re.search(r' = [\d\.]+/([\d\.]+)/[\d\.]+/[\d\.]+', pingOut, re.MULTILINE) rttAvgResult = re.search(r' = [\d\.]+/([\d\.]+)/[\d\.]+/[\d\.]+', pingOut, re.MULTILINE)
if pingError: if pingError or lossResult is None or rttAvgResult is None:
output = {'loss':-1, 'rtt_avg':-1}; output = {'loss':-1, 'rtt_avg':-1};
else: else:
output = {'loss':lossResult.group(1), 'rtt_avg':rttAvgResult.group(1)}; output = {'loss':lossResult.group(1), 'rtt_avg':rttAvgResult.group(1)};
@ -128,11 +128,11 @@ class Util:
stdout = subprocess.PIPE, stdout = subprocess.PIPE,
stderr = subprocess.PIPE stderr = subprocess.PIPE
) )
pingOut, error = ping.communicate() pingOut, pingError = ping.communicate()
# print out # print out
lossResult = re.search(r' ([0-9]+)% packet loss', pingOut, re.MULTILINE) lossResult = re.search(r' ([\d\.]+)% packet loss', pingOut, re.MULTILINE)
rttAvgResult = re.search(r' = [\d\.]+/([\d\.]+)/[\d\.]+/[\d\.]+', pingOut, re.MULTILINE) rttAvgResult = re.search(r' = [\d\.]+/([\d\.]+)/[\d\.]+/[\d\.]+', pingOut, re.MULTILINE)
if pingError: if pingError or lossResult is None or rttAvgResult is None:
output = {'loss':-1, 'rtt_avg':-1}; output = {'loss':-1, 'rtt_avg':-1};
else: else:
output = {'loss':lossResult.group(1), 'rtt_avg':rttAvgResult.group(1)}; output = {'loss':lossResult.group(1), 'rtt_avg':rttAvgResult.group(1)};