[Update] 修复child shutdown可能的bug

f8a3846f · ibuler · 17d01a8e · f8a3846f · f8a3846f
Commit f8a3846f authored May 18, 2018 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

interactive.py coco/interactive.py +1 -1

models.py coco/models.py +5 -2

No files found.
--- a/coco/interactive.py
+++ b/coco/interactive.py
@@ -263,7 +263,7 @@ class InteractiveServer:
        self.display_banner()
        while True:
            try:
-                opt = net_input(self.client, prompt='Opt>', before=1)
+                opt = net_input(self.client, prompt='Opt> ', before=1)
                rv = self.dispatch(opt)
                if rv is self._sentinel:
                    break

--- a/coco/models.py
+++ b/coco/models.py
@@ -264,8 +264,11 @@ class WSProxy:
    def close(self):
        self.stop_event.set()
-        self.child.shutdown(1)
+        try:
-        self.child.close()
+            self.child.shutdown(1)
+            self.child.close()
+        except OSError:
+            pass
        logger.debug("Proxy {} closed".format(self))