From f46735200d638424950b2242e112eec4ad84c4ac Mon Sep 17 00:00:00 2001
From: Maarten Breddels <maartenbreddels@gmail.com>
Date: Fri, 2 Nov 2018 16:50:36 +0100
Subject: [PATCH] better shutdown of server, so we can reuse the port, see:
 https://github.com/tornadoweb/tornado/issues/2523

---
 nbconvert/preprocessors/snapshot.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/nbconvert/preprocessors/snapshot.py b/nbconvert/preprocessors/snapshot.py
index 3d906aa94..e5b497c19 100644
--- a/nbconvert/preprocessors/snapshot.py
+++ b/nbconvert/preprocessors/snapshot.py
@@ -152,8 +152,15 @@ def callback(self):
         for key, value in self.snapshot_dict.items():
             if value['data'][MIME_TYPE_PNG] is None:
                 done = False
+
         if done and not self.keep_running:
-            self.main_ioloop.stop()
+            self.stop_server()
+
+    # see https://github.com/tornadoweb/tornado/issues/2523
+    def stop_server(self):
+        self.http_server.stop()
+        self.main_ioloop.add_future(self.http_server.close_all_connections(),
+                                    lambda x: self.main_ioloop.stop())
 
     def preprocess(self, nb, resources):
         """Serve the build directory with a webserver."""
@@ -194,12 +201,11 @@ def preprocess(self, nb, resources):
                                       client=AsyncHTTPClient(),
                                       )
                 
-                # hook up tornado logging to our logger
+                # hook up tornado logger to our logger
                 log.app_log = self.log
 
-                http_server = httpserver.HTTPServer(app)
-                self.port = next(next_port)
-                http_server.listen(self.port, address=self.ip)
+                self.http_server = httpserver.HTTPServer(app)
+                self.http_server.listen(self.port, address=self.ip)
                 url = "http://%s:%i/%s" % (self.ip, self.port, filename)
                 print("Serving your slides at %s" % url)
                 print("Use Control-C to stop this server")
@@ -212,12 +218,10 @@ def preprocess(self, nb, resources):
                     self.main_ioloop.start()
                 except KeyboardInterrupt:
                     print("\nInterrupted")
-                http_server.stop()
+                    self.http_server.stop()
+                    # TODO: maybe we need to wait for this to finish
+                    self.http_server.close_all_connections()
                 # nbformat.write(self.nb, input.replace('.html', '.ipynb'))
-            # import IPython
-            # IPython.embed()
-            # import pdb
-            # pdb.set_trace()
         return nb, resources
 
 def main(path):