service.Run supports passing in context (#3504)

This commit is contained in:
fatedier
2023-06-29 18:04:20 +08:00
committed by GitHub
parent 801e8c6742
commit 4c4d5f0d0d
5 changed files with 39 additions and 18 deletions

View File

@@ -15,6 +15,7 @@
package sub
import (
"context"
"fmt"
"io/fs"
"net"
@@ -233,7 +234,7 @@ func startService(
go handleSignal(svr, closedDoneCh)
}
err = svr.Run()
err = svr.Run(context.Background())
if err == nil && shouldGracefulClose {
<-closedDoneCh
}

View File

@@ -15,6 +15,7 @@
package main
import (
"context"
"fmt"
"os"
@@ -210,6 +211,6 @@ func runServer(cfg config.ServerCommonConf) (err error) {
return err
}
log.Info("frps started successfully")
svr.Run()
svr.Run(context.Background())
return
}