[GRASS-SVN] r67673 - grass/trunk/lib/python/pygrass/rpc

[svn_grass at osgeo.org]

Author: huhabla
Date: 2016-01-26 00:19:20 -0800 (Tue, 26 Jan 2016)
New Revision: 67673

Modified:
   grass/trunk/lib/python/pygrass/rpc/base.py
Log:
pygrass rpc: Terminate the server process instead of joining to avoid deadlock


Modified: grass/trunk/lib/python/pygrass/rpc/base.py
===================================================================
--- grass/trunk/lib/python/pygrass/rpc/base.py	2016-01-26 08:18:38 UTC (rev 67672)
+++ grass/trunk/lib/python/pygrass/rpc/base.py	2016-01-26 08:19:20 UTC (rev 67673)
@@ -130,7 +130,7 @@
         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 @@
         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()