frpc: do a graceful close for quic protocol at exit (#3282)

This commit is contained in:
Gerhard Tan 2023-02-01 13:09:31 +08:00 committed by GitHub
parent 24c7d1d9e2
commit b1b8d9a82b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions

View File

@ -216,15 +216,16 @@ func startService(
return return
} }
kcpDoneCh := make(chan struct{}) closedDoneCh := make(chan struct{})
// Capture the exit signal if we use kcp. shouldGracefulClose := cfg.Protocol == "kcp" || cfg.Protocol == "quic"
if cfg.Protocol == "kcp" { // Capture the exit signal if we use kcp or quic.
go handleSignal(svr, kcpDoneCh) if shouldGracefulClose {
go handleSignal(svr, closedDoneCh)
} }
err = svr.Run() err = svr.Run()
if err == nil && cfg.Protocol == "kcp" { if err == nil && shouldGracefulClose {
<-kcpDoneCh <-closedDoneCh
} }
return return
} }