Log local address when connecting/disconnecting in RPC

Author: lw

cms/io/rpc.py

@@ -93,6 +93,7 @@ def __init__(self, remote_address):
             connection (origin or target, depending on its direction).
 
         """
+        self._local_address = None
         self.remote_address = remote_address
         self._connection_event = gevent.event.Event()
 
@@ -160,8 +161,13 @@ def initialize(self, sock, plus):
         self._reader = self._socket.makefile('rb')
         self._writer = self._socket.makefile('wb')
         self._connection_event.set()
+        # IPv4 addresses have two elements (host and port), IPv6 ones
+        # have 4 elements (host, port, flowinfo and scopeid). We will
+        # discard the last two ones, losing information, to simplify.
+        self._local_address = "%s:%d" % self._socket.getsockname()[:2]
 
-        logger.info("Established connection with %s.", self._repr_remote())
+        logger.info("Established connection with %s (local address: %s).",
+                    self._repr_remote(), self._local_address)
 
         for handler in self._on_connect_handlers:
             gevent.spawn(handler, plus)
@@ -179,14 +185,15 @@ def finalize(self, reason=""):
         if not self.connected:
             return
 
+        logger.info("Terminated connection with %s (local address: %s): %s",
+                    self._repr_remote(), self._local_address, reason)
+
         self._socket = None
         self._reader = None
         self._writer = None
+        self._local_address = None
         self._connection_event.clear()
 
-        logger.info("Terminated connection with %s: %s", self._repr_remote(),
-                    reason)
-
         for handler in self._on_disconnect_handlers:
             gevent.spawn(handler)