From 106985695d23c8fd403d4a0a6c10f1f86eb220e4 Mon Sep 17 00:00:00 2001
From: chenxy123 <xiaoyou.chen@hotmail.com>
Date: Fri, 16 Dec 2016 23:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9vn.rpc=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E5=AF=B9=E5=A4=96=E6=9A=B4=E9=9C=B2run?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vn.rpc/vnrpc.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/vn.rpc/vnrpc.py b/vn.rpc/vnrpc.py
index 9558281b..f95d0597 100644
--- a/vn.rpc/vnrpc.py
+++ b/vn.rpc/vnrpc.py
@@ -123,7 +123,7 @@ class RpcServer(RpcObject):
         
         # 工作线程相关
         self.__active = False                             # 服务器的工作状态
-        self.__thread = threading.Thread(target=self.__run) # 服务器的工作线程
+        self.__thread = threading.Thread(target=self.run) # 服务器的工作线程
         
     #----------------------------------------------------------------------
     def start(self):
@@ -132,7 +132,8 @@ class RpcServer(RpcObject):
         self.__active = True
         
         # 启动工作线程
-        self.__thread.start()
+        if not self.__thread.isAlive():
+            self.__thread.start()
         
     #----------------------------------------------------------------------
     def stop(self):
@@ -141,11 +142,12 @@ class RpcServer(RpcObject):
         self.__active = False
         
         # 等待工作线程退出
-        self.__thread.join()
+        if self.__thread.isAlive():
+            self.__thread.join()
     
     #----------------------------------------------------------------------
-    def __run(self):
-        """连续运行函数"""
+    def run(self):
+        """服务器运行函数"""
         while self.__active:
             # 从请求响应socket收取请求数据
             reqb = self.__socketREP.recv()
@@ -208,7 +210,7 @@ class RpcClient(RpcObject):
 
         # 工作线程相关，用于处理服务器推送的数据
         self.__active = False                                   # 客户端的工作状态
-        self.__thread = threading.Thread(target=self.__run)     # 客户端的工作线程
+        self.__thread = threading.Thread(target=self.run)       # 客户端的工作线程
         
     #----------------------------------------------------------------------
     def __getattr__(self, name):
@@ -247,7 +249,8 @@ class RpcClient(RpcObject):
         self.__active = True
         
         # 启动工作线程
-        self.__thread.start()
+        if not self.__thread.isAlive():
+            self.__thread.start()
     
     #----------------------------------------------------------------------
     def stop(self):
@@ -256,11 +259,12 @@ class RpcClient(RpcObject):
         self.__active = False
         
         # 等待工作线程退出
-        self.__thread.join()
+        if self.__thread.isAlive():
+            self.__thread.join()
         
     #----------------------------------------------------------------------
-    def __run(self):
-        """连续运行函数"""
+    def run(self):
+        """客户端运行函数"""
         while self.__active:
             # 从订阅socket收取广播数据
             topic, datab = self.__socketSUB.recv_multipart()