cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Fix daemon shutdown

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera 2020-07-08 20:56:03 +02:00
parent 0e7b7c9fdb
commit ebecca64a1
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/lotus/rpc.go
View File

@ -63,6 +63,7 @@ func serveRPC(a api.FullNode, stop node.StopFunc, addr multiaddr.Multiaddr, shut
srv := &http.Server{Handler: http.DefaultServeMux} srv := &http.Server{Handler: http.DefaultServeMux}
sigCh := make(chan os.Signal, 2) sigCh := make(chan os.Signal, 2)
shutdownDone := make(chan struct{})
go func() { go func() {
select { select {
case <-sigCh: case <-sigCh:
@ -77,10 +78,17 @@ func serveRPC(a api.FullNode, stop node.StopFunc, addr multiaddr.Multiaddr, shut
log.Errorf("graceful shutting down failed: %s", err) log.Errorf("graceful shutting down failed: %s", err)
} }
log.Warn("Graceful shutdown successful") log.Warn("Graceful shutdown successful")
log.Sync()
close(shutdownDone)
}() }()
signal.Notify(sigCh, syscall.SIGTERM, syscall.SIGINT) signal.Notify(sigCh, syscall.SIGTERM, syscall.SIGINT)
return srv.Serve(manet.NetListener(lst)) err = srv.Serve(manet.NetListener(lst))
if err == http.ErrServerClosed {
<-shutdownDone
return nil
}
return err
} }
func handleImport(a *impl.FullNodeAPI) func(w http.ResponseWriter, r *http.Request) { func handleImport(a *impl.FullNodeAPI) func(w http.ResponseWriter, r *http.Request) {