Skip to content
Snippets Groups Projects
Commit ed359a61 authored by Jake Taylor's avatar Jake Taylor
Browse files

fixes for e2ereports script

parent eaf384ac
No related branches found
No related tags found
2 merge requests!68Master merge,!11Release
...@@ -48,17 +48,24 @@ def main(): ...@@ -48,17 +48,24 @@ def main():
else: else:
if "Successfully sent to EphID" in line: if "Successfully sent to EphID" in line:
# Capture message sending # Capture message sending
sent_message = re.findall('msgDigest: (.{20})\)', line)[0] sent_msg = re.findall('msgDigest: (.{20})\)', line)
if len(sent_msg) == 0:
continue
sent_message = sent_msg[0]
log.debug("Located sent message: {}".format(sent_message)) log.debug("Located sent message: {}".format(sent_message))
messages_sent[sent_message] = {"sender": os.path.basename(path)}
# Capture message timestamp # Capture message timestamp
sent_timestamp_str = re.findall('INFO (.{19}\.{0,1}\d{0,6})', line)[0] sent_ts = re.findall('INFO (.{19}\.{0,1}\d{0,6})', line)
if len(sent_ts) == 0:
continue
sent_timestamp_str = sent_ts[0]
try: try:
sent_timestamp = datetime.datetime.strptime(sent_timestamp_str, '%Y/%m/%d %H:%M:%S.%f') sent_timestamp = datetime.datetime.strptime(sent_timestamp_str, '%Y/%m/%d %H:%M:%S.%f')
except ValueError: except ValueError:
sent_timestamp = datetime.datetime.strptime(sent_timestamp_str, '%Y/%m/%d %H:%M:%S') sent_timestamp = datetime.datetime.strptime(sent_timestamp_str, '%Y/%m/%d %H:%M:%S')
log.debug("Located sent timestamp: {}".format(sent_timestamp)) log.debug("Located sent timestamp: {}".format(sent_timestamp))
messages_sent[sent_message] = {"sender": os.path.basename(path)}
messages_sent[sent_message]["sent"] = sent_timestamp messages_sent[sent_message]["sent"] = sent_timestamp
# Capture rounds messages were sent in # Capture rounds messages were sent in
...@@ -72,16 +79,19 @@ def main(): ...@@ -72,16 +79,19 @@ def main():
# Capture message receiving # Capture message receiving
received_message = re.findall(' msgDigest: (.{20})', line)[0] received_message = re.findall(' msgDigest: (.{20})', line)[0]
log.debug("Located received message: {}".format(received_message)) log.debug("Located received message: {}".format(received_message))
messages_received[received_message] = {"receiver": os.path.basename(path)}
# Capture message timestamp # Capture message timestamp
received_timestamp_str = re.findall('INFO (.{19}\.{0,1}\d{0,6})', line)[0] receive_ts = re.findall('INFO (.{19}\.{0,1}\d{0,6})', line)
if len(receive_ts) == 0:
continue
received_timestamp_str = receive_ts[0]
try: try:
received_timestamp = datetime.datetime.strptime(received_timestamp_str, received_timestamp = datetime.datetime.strptime(received_timestamp_str,
'%Y/%m/%d %H:%M:%S.%f') '%Y/%m/%d %H:%M:%S.%f')
except ValueError: except ValueError:
received_timestamp = datetime.datetime.strptime(received_timestamp_str, '%Y/%m/%d %H:%M:%S') received_timestamp = datetime.datetime.strptime(received_timestamp_str, '%Y/%m/%d %H:%M:%S')
log.debug("Located received timestamp: {}".format(received_timestamp)) log.debug("Located received timestamp: {}".format(received_timestamp))
messages_received[received_message] = {"receiver": os.path.basename(path)}
messages_received[received_message]["received"] = received_timestamp messages_received[received_message]["received"] = received_timestamp
elif "Round(s)" in line: elif "Round(s)" in line:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment