Ticket #4021: 4021_address_eventTransport.patch

twisted/internet/protocol.py

@@ -622 +622 @@
         This will be called by makeConnection(), users should not call it.
         """
         if not self.numPorts:
-            log.msg(eventSource=self, eventType="start", eventTransport="udp",
-                    address="", protocol=self)
+            log.msg(eventSource=self, eventType="start", protocol=self)
             self.startProtocol()
         self.numPorts = self.numPorts + 1
 
@@ -637 +636 @@
         self.numPorts = self.numPorts - 1
         self.transport = None
         if not self.numPorts:
-            log.msg(eventSource=self, eventType="stop", eventTransport="udp",
-                    address="", protocol=self)
+            log.msg(eventSource=self, eventType="stop", protocol=self)
             self.stopProtocol()
 
 

twisted/internet/tcp.py

@@ -859 +859 @@
         # Make sure that if we listened on port 0, we update that to
         # reflect what the OS actually assigned us.
         self._realPortNumber = skt.getsockname()[1]
-        
-        _ip = self.interface if self.interface else "0.0.0.0"
 
-        log.msg(eventSource=self, eventType="start", eventTransport="tcp",
-                factory=self.factory,
-                address="%s:%d" % (_ip,self._realPortNumber))
+        log.msg(eventSource=self, eventType="start", factory=self.factory,
+                portNumber=self._realPortNumber)
 
         # The order of the next 6 lines is kind of bizarre.  If no one
         # can explain it, perhaps we should re-arrange them.
@@ -979 +976 @@
         """
         Log message for closing port
         """
-        _ip = self.interface if self.interface else "0.0.0.0"
-        log.msg(eventSource=self, eventType="stop", eventTransport="tcp",
-                factory=self.factory,
-                address="%s:%d" % (_ip,self._realPortNumber))
+        log.msg(eventSource=self, eventType="stop", factory=self.factory,
+                portNumber=self._realPortNumber)
 
 
     def connectionLost(self, reason):

twisted/internet/test/test_protocol.py

@@ -360 +360 @@
             self.events[0],
             {"eventSource": self.proto,
              "protocol": self.proto,
-             "eventType": "start",
-             "eventTransport" : "udp",
-             "address" : ""})
+             "eventType": "start"})
 
 
     def test_doStopLogMessage(self):
@@ -377 +375 @@
             self.events[0],
             {"eventSource": self.proto,
              "protocol": self.proto,
-             "eventType": "stop",
-             "eventTransport" : "udp",
-             "address" : ""})
+             "eventType": "stop"})

twisted/internet/test/test_tcp.py

@@ -325 +325 @@
         ReactorBuilder.setUp(self)
         self.factory = ServerFactory()
         self.events = []
-        self.transportType = "tcp"
         log.addObserver(self.events.append)
         self.addCleanup(log.removeObserver, self.events.append)
 
@@ -342 +341 @@
         Get the expected port number for the TCP port that experienced
         the connection event.
         """
-        return str(port.getHost().port)
-        
-    def getExpectedConnectionPortHost(self, port):
-        """
-        Get the expected hostname/IP for the TCP port that experienced
-        the connection event.
-        """
-        return port.getHost().host
+        return port.getHost().port
 
 
     def test_portStartStopLogMessage(self):
@@ -361 +353 @@
         reactor = self.buildReactor()
         p = self.getListeningPort(reactor)
         listenPort = self.getExpectedConnectionPortNumber(p)
-        listenHost = self.getExpectedConnectionPortHost(p)
 
         def stopReactor(ignored):
             reactor.stop()
@@ -373 +364 @@
         self.runReactor(reactor)
 
         expected = {
-            "eventSource": p, "address": "%s:%s" % (listenHost, listenPort),
-            "eventTransport" : self.transportType, "factory": self.factory}
+            "eventSource": p, "portNumber": listenPort, "factory": self.factory}
 
         for event in self.events:
             if event.get("eventType") == "start":

twisted/internet/test/test_unix.py

@@ -147 +147 @@
     """
 
     requiredInterfaces = [interfaces.IReactorUNIX]
-    
-    def setUp(self):
-        """
-        Extend TCP test setUp to set transportType to 'unix'.
-        """
-        TCPPortTestsBuilder.setUp(self)
-        self.transportType = "unix"
 
     def getListeningPort(self, reactor):
         """
@@ -167 +160 @@
         Get the expected UNIX socket path from the given UNIX listening port.
         """
         return port.getHost().name
-    
-    def getExpectedConnectionPortHost(self, port):
-        """
-        Return an empty string, since there is no hostname for a UNIX socket.
-        """
-        
-        return ""
 
 
 globals().update(UNIXTestsBuilder.makeTestCaseClasses())

twisted/internet/unix.py

@@ -112 +112 @@
                     except:
                         pass
 
-        log.msg(eventSource=self, eventType="start", eventTransport="unix",
-                address=":%s" % self.port,factory=self.factory)
+        log.msg(eventSource=self, eventType="start", factory=self.factory,
+                portNumber=self.port)
         self.factory.doStart()
         try:
             skt = self.createInternetSocket()
@@ -136 +136 @@
         """
         Log message for closing socket
         """
-        log.msg(eventSource=self, eventType="stop", eventTransport="unix",
-                address=":%s" % self.port, factory=self.factory)
+        log.msg(eventSource=self, eventType="stop", factory=self.factory,
+                portNumber=self.port)
 
 
     def connectionLost(self, reason):