Merge pull request #4674 from asreimer/patch-1

bugfix: shutdown_server returns True when pid exists
7 years ago · 3c9cad69af
parent 2d274295c9 dd0f5d2608
commit 3c9cad69af
1 changed files with 2 additions and 2 deletions
--- a/notebook/notebookapp.py
+++ b/notebook/notebookapp.py
@ -421,7 +421,7 @@ def shutdown_server(server_info, timeout=5, log=None):

    # Poll to see if it shut down.
    for _ in range(timeout*10):
-        if check_pid(pid):
+        if not check_pid(pid):
            if log: log.debug("Server PID %s is gone", pid)
            return True
        time.sleep(0.1)
@ -434,7 +434,7 @@ def shutdown_server(server_info, timeout=5, log=None):

    # Poll to see if it shut down.
    for _ in range(timeout * 10):
-        if check_pid(pid):
+        if not check_pid(pid):
            if log: log.debug("Server PID %s is gone", pid)
            return True
        time.sleep(0.1)