mirror of
https://github.com/fatedier/frp.git
synced 2025-07-27 07:35:07 +00:00
service.Run supports passing in context (#3504)
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
@@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user