From d3c6830ba3ac119209b6102d116cff510999a4db Mon Sep 17 00:00:00 2001 From: john Date: Tue, 4 Sep 2018 18:54:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9AWebServer=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E6=A3=80=E6=B5=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- g/net/ghttp/ghttp_server.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/g/net/ghttp/ghttp_server.go b/g/net/ghttp/ghttp_server.go index 5553bdd6b..d33006e29 100644 --- a/g/net/ghttp/ghttp_server.go +++ b/g/net/ghttp/ghttp_server.go @@ -411,8 +411,15 @@ func (s *Server) startServer(fdMap listenerFdMap) { // 获取当前服务器的状态 func (s *Server) Status() int { - if serverRunning.Val() > 0 { - return SERVER_STATUS_RUNNING + // 当全局运行的Web Server数量为0时表示所有Server都是停止状态 + if serverRunning.Val() == 0 { + return SERVER_STATUS_STOPPED + } + // 只要有一个Server处于运行状态,那么都表示运行状态 + for _, v := range s.servers { + if v.status == SERVER_STATUS_RUNNING { + return SERVER_STATUS_RUNNING + } } return SERVER_STATUS_STOPPED }