diff --git a/basice2e/e2eReport.py b/basice2e/e2eReport.py index 1c6bf421afc1ad47e5d6e2f3294d5e52aae60202..94e90034fcd6a1441f0506617df273ceeaab0859 100755 --- a/basice2e/e2eReport.py +++ b/basice2e/e2eReport.py @@ -75,9 +75,9 @@ def main(): if sent_round not in rounds_sent: rounds_sent[sent_round] = False - elif "Received message of type" in line or "Received AuthRequest from" in line or "Received AuthConfirm from" in line: + elif "Received message of" in line or "Received AuthRequest from" in line or "Received AuthConfirm from" in line: # 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)) # Capture message timestamp diff --git a/basice2e/registration.json b/basice2e/registration.json index 1205075ffa93572ea38a994d6dbb73b80622b061..0c4a121947b1427f52c71c26eb83aaa5e03b7af7 100644 --- a/basice2e/registration.json +++ b/basice2e/registration.json @@ -4,11 +4,9 @@ "RealtimeTimeout": 15000, "DebugTrackRounds": true, "BatchSize": 32, - "MinimumDelay": 3000, - "RealtimeDelay": 5000, - "SemiOptimalOrdering": true, - "Secure": true, + "MinimumDelay": 1000, + "RealtimeDelay": 2000, "Threshold": 0.3, - "NodeCleanUpInterval": 3, + "NodeCleanUpInterval": 180000, "ResourceQueueTimeout": 300000 }