From 42833f35e51f45861826873e41b218f601f48e22 Mon Sep 17 00:00:00 2001 From: mailchuck Date: Tue, 26 Jan 2016 11:54:11 +0100 Subject: [PATCH] Thread names for IPv6 Thread names for IPv6 contained ":". This caused problems in log parsers. --- src/class_outgoingSynSender.py | 2 +- src/class_receiveDataThread.py | 2 +- src/class_sendDataThread.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/class_outgoingSynSender.py b/src/class_outgoingSynSender.py index 738882ef..58db78b8 100644 --- a/src/class_outgoingSynSender.py +++ b/src/class_outgoingSynSender.py @@ -80,7 +80,7 @@ class outgoingSynSender(threading.Thread, StoppableThread): shared.alreadyAttemptedConnectionsListLock.release() except threading.ThreadError as e: pass - self.name = "outgoingSynSender-" + peer.host + self.name = "outgoingSynSender-" + peer.host.replace(":", ".") # log parser field separator if peer.host.find(':') == -1: address_family = socket.AF_INET else: diff --git a/src/class_receiveDataThread.py b/src/class_receiveDataThread.py index 59399d7a..fbc55ae0 100644 --- a/src/class_receiveDataThread.py +++ b/src/class_receiveDataThread.py @@ -46,7 +46,7 @@ class receiveDataThread(threading.Thread): self.sock = sock self.peer = shared.Peer(HOST, port) - self.name = "receiveData-" + self.peer.host + self.name = "receiveData-" + self.peer.host.replace(":", ".") # ":" log parser field separator self.streamNumber = streamNumber self.objectsThatWeHaveYetToGetFromThisPeer = {} self.selfInitiatedConnections = selfInitiatedConnections diff --git a/src/class_sendDataThread.py b/src/class_sendDataThread.py index f151f55b..9c048d32 100644 --- a/src/class_sendDataThread.py +++ b/src/class_sendDataThread.py @@ -36,7 +36,7 @@ class sendDataThread(threading.Thread): someObjectsOfWhichThisRemoteNodeIsAlreadyAware): self.sock = sock self.peer = shared.Peer(HOST, PORT) - self.name = "sendData-" + self.peer.host + self.name = "sendData-" + self.peer.host.replace(":", ".") # log parser field separator self.streamNumber = streamNumber self.services = 0 self.initiatedConnection = False