浏览代码

pygrass rpc: Terminate the server process instead of joining to avoid deadlock

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67673 15284696-431f-4ddb-bdfa-cd5b030d7da7
Soeren Gebbert 9 年之前
父节点
当前提交
95f4fc3ff8
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      lib/python/pygrass/rpc/base.py

+ 2 - 2
lib/python/pygrass/rpc/base.py

@@ -130,7 +130,7 @@ class RPCServerBase(object):
         self.client_conn, self.server_conn = Pipe(True)
         self.lock = Lock()
         self.server = Process(target=dummy_server, args=(self.lock,
-                                                             self.server_conn))
+                                                         self.server_conn))
         self.server.daemon = True
         self.server.start()
 
@@ -174,7 +174,7 @@ class RPCServerBase(object):
         self.stop_checker_thread()
         if self.server is not None and self.server.is_alive():
             self.client_conn.send([0, ])
-            self.server.join()
+            self.server.terminate()
         if self.client_conn is not None:
             self.client_conn.close()