From 368b329d51e3aa52481dcfc69dde9473bf2af9d9 Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@elixxir.io>
Date: Mon, 24 May 2021 13:53:16 -0500
Subject: [PATCH] add better timestamps to e2eReport.py
---
basice2e/e2eReport.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/basice2e/e2eReport.py b/basice2e/e2eReport.py
index 806e984..83525cf 100644
--- a/basice2e/e2eReport.py
+++ b/basice2e/e2eReport.py
@@ -52,8 +52,11 @@ def main():
messages_sent[sent_message] = {"sender": os.path.basename(path)}
# Capture message timestamp
- sent_timestamp_str = re.findall('INFO (.{19})', line)[0]
- sent_timestamp = datetime.datetime.strptime(sent_timestamp_str, '%Y/%m/%d %H:%M:%S')
+ sent_timestamp_str = re.findall('INFO (.{19}\.{0,1}\d{0,6})', line)[0]
+ try:
+ sent_timestamp = datetime.datetime.strptime(sent_timestamp_str, '%Y/%m/%d %H:%M:%S.%f')
+ except ValueError:
+ sent_timestamp = datetime.datetime.strptime(sent_timestamp_str, '%Y/%m/%d %H:%M:%S')
log.debug("Located sent timestamp: {}".format(sent_timestamp))
messages_sent[sent_message]["sent"] = sent_timestamp
@@ -92,9 +95,9 @@ def main():
message_latency = messages_received[msgDigest]["received"] - messages_sent[msgDigest]["sent"]
total_latency += message_latency
log.info("Message {} sent by {} on round {} was received after {}".format(msgDigest,
- senderDict["sender"],
- senderDict["round"],
- message_latency))
+ senderDict["sender"],
+ senderDict["round"],
+ message_latency))
else:
log.error("Message {} sent by {} on round {} was NOT received".format(msgDigest,
senderDict["sender"],
--
GitLab