Merge pull request #1485 from felixhjh/v0.7.0

Merge pull request #1470 from felixhjh/dev_local

python/paddle_serving_server/util.py

@@ -59,6 +59,9 @@ def kill_stop_process_by_pid(command : str, pid : int):
     if not pid_is_exist(pid):
         print("Process [%s]  has been stopped."%pid)
         return
+    if platform.system() == "Windows":
+        os.kill(pid, signal.SIGINT)   
+    else:
         try:
              if command == "stop":
                  os.killpg(pid, signal.SIGINT)

python/paddle_serving_server/web_service.py

@@ -28,6 +28,7 @@ import os
 from paddle_serving_server import pipeline
 from paddle_serving_server.pipeline import Op
 from paddle_serving_server.serve import format_gpu_to_strlist
+from paddle_serving_server.util import dump_pid_file
 
 
 def port_is_available(port):
@@ -261,6 +262,8 @@ class WebService(object):
         self.op_num = op_num
         self.op_max_batch = op_max_batch
        
+        # record port and pid info for stopping process
+        dump_pid_file([self.port], "web_service")
         # if gpuid != None, we will use gpuid first.
         # otherwise, keep the self.gpus unchanged.
         # maybe self.gpus is set by the Function set_gpus.