ensure correct pid when waiting for server
ensure correct pid when waiting for server

alvarolm/grace,sioncheng/grace,nordligulv/grace,toophy/grace,beni55/grace,nigeldunn/grace,lipengfeihb/grace,facebookgo/grace,davande/grace,latlontude/grace