mirror of
https://github.com/astaxie/beego.git
synced 2024-11-22 01:20:55 +00:00
Merge pull request #3739 from nuczzz/develop
fix graceful bug: old process didn't exist when graceful restart
This commit is contained in:
commit
f5c580a403
@ -46,7 +46,10 @@ func (srv *Server) Serve() (err error) {
|
|||||||
|
|
||||||
log.Println(syscall.Getpid(), srv.ln.Addr(), "Listener closed.")
|
log.Println(syscall.Getpid(), srv.ln.Addr(), "Listener closed.")
|
||||||
// wait for Shutdown to return
|
// wait for Shutdown to return
|
||||||
return <-srv.terminalChan
|
if shutdownErr := <-srv.terminalChan; shutdownErr != nil {
|
||||||
|
return shutdownErr
|
||||||
|
}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListenAndServe listens on the TCP network address srv.Addr and then calls Serve
|
// ListenAndServe listens on the TCP network address srv.Addr and then calls Serve
|
||||||
|
Loading…
Reference in New Issue
Block a user