Fix livereload shutdown sequence - crash on Windows

oprypin · oprypin · commit 0f8ab6bd6fbb · 2023-07-26T21:12:17.000+02:00
Fixes #3305 Regressed in commit d4d483c
diff --git a/mkdocs/livereload/__init__.py b/mkdocs/livereload/__init__.py
@@ -152,21 +152,18 @@ def unwatch(self, path: str) -> None:
             self.observer.unschedule(self._watch_refs.pop(path))
 
     def serve(self):
-        try:
-            self.server_bind()
-            self.server_activate()
+        self.server_bind()
+        self.server_activate()
 
-            self.observer.start()
+        self.observer.start()
 
-            paths_str = ", ".join(f"'{_try_relativize_path(path)}'" for path in self._watched_paths)
-            log.info(f"Watching paths for changes: {paths_str}")
+        paths_str = ", ".join(f"'{_try_relativize_path(path)}'" for path in self._watched_paths)
+        log.info(f"Watching paths for changes: {paths_str}")
 
-            log.info(f"Serving on {self.url}")
-            self.serve_thread.start()
+        log.info(f"Serving on {self.url}")
+        self.serve_thread.start()
 
-            self._build_loop()
-        finally:
-            self.server_close()
+        self._build_loop()
 
     def _build_loop(self):
         while True:
@@ -213,6 +210,7 @@ def shutdown(self, wait=False) -> None:
 
         if self.serve_thread.is_alive():
             super().shutdown()
+        self.server_close()
         if wait:
             self.serve_thread.join()
             self.observer.join()
