1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-10 18:20:55 +00:00

Merge pull request #605 from francoishill/patch-6

Update app.go
This commit is contained in:
astaxie 2014-05-14 13:12:15 +08:00
commit b6d63c84ae

12
app.go
View File

@ -62,10 +62,14 @@ func (app *App) Run() {
BeeLogger.Critical("ResolveTCPAddr:", err) BeeLogger.Critical("ResolveTCPAddr:", err)
} }
l, err = GetInitListener(laddr) l, err = GetInitListener(laddr)
theStoppable = newStoppable(l) if err == nil {
err = server.Serve(theStoppable) theStoppable = newStoppable(l)
theStoppable.wg.Wait() err = server.Serve(theStoppable)
CloseSelf() if err == nil {
theStoppable.wg.Wait()
err = CloseSelf()
}
}
} else { } else {
s := &http.Server{ s := &http.Server{
Addr: addr, Addr: addr,