From 7e140c5bafcf83fd51290a4c0865c1512c1345cd Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Tue, 25 Sep 2018 20:52:21 -0700 Subject: [PATCH 1/2] When adapting also log the version jupyter_client is expecting. It's still (IMHO) unclear how the adaptation goes. Like does "adapting to protocol X.Y.Z." mean the end-result is X.Y.Z or what you got is X.Y.Z and it's X.Y.W after adaptation. --- notebook/services/kernels/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/services/kernels/handlers.py b/notebook/services/kernels/handlers.py index 9b751adb92..df079c5c9a 100644 --- a/notebook/services/kernels/handlers.py +++ b/notebook/services/kernels/handlers.py @@ -187,7 +187,7 @@ def _finish_kernel_info(self, info): protocol_version = info.get('protocol_version', client_protocol_version) if protocol_version != client_protocol_version: self.session.adapt_version = int(protocol_version.split('.')[0]) - self.log.info("Adapting to protocol v%s for kernel %s", protocol_version, self.kernel_id) + self.log.info("Adapting to protocol v%s for kernel %s (client expecting %s)", protocol_version, self.kernel_id, client_protocol_version) if not self._kernel_info_future.done(): self._kernel_info_future.set_result(info) From 96cb061e7b6000ae3d3d3d5da3c9050b80bf0d7a Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Wed, 26 Sep 2018 11:46:14 -0700 Subject: [PATCH 2/2] More descriptive message. --- notebook/services/kernels/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/services/kernels/handlers.py b/notebook/services/kernels/handlers.py index df079c5c9a..ef90bf9122 100644 --- a/notebook/services/kernels/handlers.py +++ b/notebook/services/kernels/handlers.py @@ -187,7 +187,7 @@ def _finish_kernel_info(self, info): protocol_version = info.get('protocol_version', client_protocol_version) if protocol_version != client_protocol_version: self.session.adapt_version = int(protocol_version.split('.')[0]) - self.log.info("Adapting to protocol v%s for kernel %s (client expecting %s)", protocol_version, self.kernel_id, client_protocol_version) + self.log.info("Adapting from protocol version {protocol_version} (kernel {kernel_id}) to {client_protocol_version} (client).".format(protocol_version=protocol_version, kernel_id=self.kernel_id, client_protocol_version=client_protocol_version)) if not self._kernel_info_future.done(): self._kernel_info_future.set_result(info)