github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 09:41:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

http: fix serve http exits directly after starting

Browse Source
This commit is contained in:
Cnly 2021-07-24 18:01:58 +08:00 committed by Nick Craig-Wood
parent f39a08c9d7
commit bc74f0621e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/serve/http/http.go
View File

@ -69,6 +69,7 @@ control the stats printing.
return err return err
} }
s.Bind(router) s.Bind(router)
httplib.Wait()
return nil return nil
}) })
}, },

10
lib/http/http.go
View File

@ -231,6 +231,11 @@ func (s *server) Serve() {
} }
} }
// Wait blocks while the server is serving requests
func (s *server) Wait() {
s.closing.Wait()
}
// Router returns the server base router // Router returns the server base router
func (s *server) Router() chi.Router { func (s *server) Router() chi.Router {
return s.baseRouter return s.baseRouter
@ -291,6 +296,11 @@ func Restart() error {
return start() return start()
} }
// Wait blocks while the default http server is serving requests
func Wait() {
defaultServer.Wait()
}
// Start the default server // Start the default server
func start() error { func start() error {
defaultServerMutex.Lock() defaultServerMutex.Lock()