This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 2e9b6b7 Fix regexes in server messages (#944)
2e9b6b7 is described below
commit 2e9b6b7c5431f19a04c13c6d6b51f6fae62cbb86
Author: Blake Bender <bben...@pivotal.io>
AuthorDate: Mon Mar 7 11:49:00 2022 -0800
Fix regexes in server messages (#944)
---
tools/gnmsg/server_message_decoder.py | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/tools/gnmsg/server_message_decoder.py
b/tools/gnmsg/server_message_decoder.py
index 38b92e6..6b510a5 100644
--- a/tools/gnmsg/server_message_decoder.py
+++ b/tools/gnmsg/server_message_decoder.py
@@ -16,9 +16,7 @@
# limitations under the License.
import re
import struct
-import sys
-from collections import OrderedDict
from dateutil import parser
from server_messages import parse_server_message
@@ -52,27 +50,27 @@ class ServerMessageDecoder(DecoderBase):
self.threads_connections_ = {}
self.connection_to_tid_expression_ = re.compile(
-
r"(\d\d:\d\d:\d\d\.\d+).+:\d+\s+([\d|a-f|A-F|x|X]+)\]\s*TcrConnection::send:\s*\[([\d|a-f|A-F|x|X]+).*sending
request to endpoint.*bytes:\s*(.+)"
+
r"(\d\d:\d\d:\d\d\.\d+).+:\d+\s+([\d|a-f|A-F|x|X]+).*\]\s*TcrConnection::send:\s*\[([\d|a-f|A-F|x|X]+).*sending
request to endpoint.*bytes:\s*(.+)"
)
self.trace_header_with_pointer_expression_ = re.compile(
- r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).+:\d+\s+([\d|a-f|A-F|x|X]+)\]\s*TcrConnection::readMessage\(([\d|a-f|A-F|x|X]+)\):.*received
header from endpoint.*bytes:\s*(.+)"
+ r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).+:\d+\s+([\d|a-f|A-F|x|X]+).*\]\s*TcrConnection::readMessage\(([\d|a-f|A-F|x|X]+)\):.*received
header from endpoint.*bytes:\s*(.+)"
)
self.trace_header_without_pointer_expression_ = re.compile(
- r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).*:\d+\s+([\d|a-f|A-F|x|X]+)\]\s*TcrConnection::readMessage:\s*received
header from endpoint.*bytes:\s*(.+)"
+ r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).*:\d+\s+([\d|a-f|A-F|x|X]+).*\]\s*TcrConnection::readMessage:\s*received
header from endpoint.*bytes:\s*(.+)"
)
self.trace_header_v911_expression_ = re.compile(
- r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).*:\d+\s+(\d+)\]\s*TcrConnection::readMessage: received
header from endpoint.*bytes:\s*([\d| ]+)"
+ r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).*:\d+\s+(\d+).*\]\s*TcrConnection::readMessage: received
header from endpoint.*bytes:\s*([\d| ]+)"
)
self.receive_trace_body_expression_ = re.compile(
- ":\d+\s+([\d|a-f|A-F|x|X]+)\]\s*TcrConnection::readMessage:
received message body from endpoint.*bytes:\s*(.+)"
+ ":\d+\s+([\d|a-f|A-F|x|X]+).*\]\s*TcrConnection::readMessage:
received message body from endpoint.*bytes:\s*(.+)"
)
self.security_trace_expression_ = re.compile(
- r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).*:\d+\s+(\d+)\]\s*TcrMessage::addSecurityPart\s*\[(0x[\d|a-f|A-F]*).*length\s*=\s*(\d+)\s*,\s*encrypted\s+ID\s*=\s*(.+)"
+ r"(\d\d\d\d\/\d\d\/\d\d
\d\d:\d\d:\d\d\.\d+).*:\d+\s+(\d+).*\]\s*TcrMessage::addSecurityPart\s*\[(0x[\d|a-f|A-F]*).*length\s*=\s*(\d+)\s*,\s*encrypted\s+ID\s*=\s*(.+)"
)
self.response_header_with_pointer_expression_ = re.compile(
@@ -358,9 +356,7 @@ class ServerMessageDecoder(DecoderBase):
pass
elif self.get_receive_trace_parts(line, parts):
tid = parts[1]
- last_header = OrderedDict[
- "Timestamp" : parts[0], "tid":tid, "Connection" : parts[2]
- ]
+ last_header = {"Timestamp": parts[0], "tid": tid, "Connection":
parts[2]}
message_bytes = parts[3]
self.headers_[tid] = last_header
if (
