Nov 13, 2017 · Nov 10, 2017 · Nov 10, 2017 · Nov 13, 2017 · Nov 10, 2017
diff --git a/notebook/base/zmqhandlers.py b/notebook/base/zmqhandlers.py

    def open(self, *args, **kwargs):
        self.log.debug("Opening websocket %s", self.request.path)


        # start the pinging
        if self.ping_interval > 0:
            loop = ioloop.IOLoop.current()
            self.last_ping = loop.time()  # Remember time of last ping
            self.last_pong = self.last_ping
            self.ping_callback = ioloop.PeriodicCallback(
                self.send_ping, self.ping_interval, io_loop=loop,
                self.send_ping, self.ping_interval,
            )
            self.ping_callback.start()
        return super(WebSocketMixin, self).open(*args, **kwargs)
        if self.stream.closed() and self.ping_callback is not None:
            self.ping_callback.stop()
            return


        # check for timeout on pong.  Make sure that we really have sent a recent ping in
        # case the machine with both server and client has been suspended since the last ping.
        now = ioloop.IOLoop.current().time()
diff --git a/notebook/services/kernels/kernelmanager.py b/notebook/services/kernels/kernelmanager.py
                        self.cull_interval, self.cull_interval_default)
                    self.cull_interval = self.cull_interval_default
                self._culler_callback = PeriodicCallback(
                    self.cull_kernels, 1000*self.cull_interval, loop)
                    self.cull_kernels, 1000*self.cull_interval)
                self.log.info("Culling kernels with idle durations > %s seconds at %s second intervals ...",
                    self.cull_idle_timeout, self.cull_interval)
                if self.cull_busy:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -158,14 +158,14 @@ def clear_cookie(self, args, *kwargs):

		def open(self, args, *kwargs):
		self.log.debug("Opening websocket %s", self.request.path)


		# start the pinging
		if self.ping_interval > 0:
		loop = ioloop.IOLoop.current()
		self.last_ping = loop.time() # Remember time of last ping
		self.last_pong = self.last_ping
		self.ping_callback = ioloop.PeriodicCallback(
		self.send_ping, self.ping_interval, io_loop=loop,
		self.send_ping, self.ping_interval,
		)
		self.ping_callback.start()
		return super(WebSocketMixin, self).open(args, *kwargs)
Expand All		@@ -175,7 +175,7 @@ def send_ping(self):
		if self.stream.closed() and self.ping_callback is not None:
		self.ping_callback.stop()
		return


		# check for timeout on pong. Make sure that we really have sent a recent ping in
		# case the machine with both server and client has been suspended since the last ping.
		now = ioloop.IOLoop.current().time()
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -386,7 +386,7 @@ def initialize_culler(self):
		self.cull_interval, self.cull_interval_default)
		self.cull_interval = self.cull_interval_default
		self._culler_callback = PeriodicCallback(
		self.cull_kernels, 1000*self.cull_interval, loop)
		self.cull_kernels, 1000*self.cull_interval)
		self.log.info("Culling kernels with idle durations > %s seconds at %s second intervals ...",
		self.cull_idle_timeout, self.cull_interval)
		if self.cull_busy:
Expand Down