status: let some pings fail

named-data · May 14, 2024 · 0cbafcc · 0cbafcc
1 parent 83fa931
commit 0cbafcc
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/framework/status-json.py b/framework/status-json.py
@@ -79,20 +79,20 @@ def get_ndnping(routers: dict[str, dict]):
         if ping_prefix:
             print(f'ndnping {host_name} with prefix {ping_prefix} -> ', file=sys.stderr, end='', flush=True)
 
-            code, stdout = compose.exec('ndnpingserver', ['ndnping', '-c', '3', '-i', '10', ping_prefix], timeout=10)
-            success = code == 0
-            if success:
-                # Parse duration from ndnping output
-                # content from /ndn/ca/utoronto: seq=4544900493281171156 time=91.6838 ms
-                durations = []
-                for line in stdout.decode('utf-8').splitlines():
-                    match = re.search(r'time=([\d.]+)', line)
-                    if match:
-                        durations.append(float(match.group(1)))
-
-                duration = round(sum(durations) / len(durations), 3) if durations else -1
-                result[host_name] = duration
-                print(duration, file=sys.stderr)
+            _, stdout = compose.exec('ndnpingserver', ['ndnping', '-c', '3', '-i', '100', ping_prefix], timeout=10)
+
+            # Parse duration from ndnping output
+            # content from /ndn/ca/utoronto: seq=4544900493281171156 time=91.6838 ms
+            durations = []
+            for line in stdout.decode('utf-8').splitlines():
+                match = re.search(r'^content .* time=([\d.]+)', line)
+                if match:
+                    durations.append(float(match.group(1)))
+
+            if durations:
+                avg = round(sum(durations) / len(durations), 2)
+                result[host_name] = avg
+                print(avg, file=sys.stderr)
             else:
                 result[host_name] = False
                 print('fail', file=sys.stderr)