mirror of
https://github.com/komari-monitor/komari.git
synced 2025-10-23 03:31:56 +00:00
refactor: 移除不必要的 nezhaBoot 变量,更新 StopNezhaCompat 以强制停止服务器
This commit is contained in:
@@ -68,7 +68,6 @@ var (
|
|||||||
nezhaSrv *grpc.Server
|
nezhaSrv *grpc.Server
|
||||||
nezhaLis net.Listener
|
nezhaLis net.Listener
|
||||||
nezhaOnceM sync.Mutex
|
nezhaOnceM sync.Mutex
|
||||||
nezhaBoot uint64
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// StartNezhaCompat starts the Nezha compatible gRPC server asynchronously.
|
// StartNezhaCompat starts the Nezha compatible gRPC server asynchronously.
|
||||||
@@ -101,7 +100,6 @@ func StartNezhaCompat(addr string) error {
|
|||||||
proto.RegisterNezhaServiceServer(gs, sImpl)
|
proto.RegisterNezhaServiceServer(gs, sImpl)
|
||||||
nezhaSrv = gs
|
nezhaSrv = gs
|
||||||
nezhaLis = lis
|
nezhaLis = lis
|
||||||
nezhaBoot = boot
|
|
||||||
go func() {
|
go func() {
|
||||||
if err := gs.Serve(lis); err != nil {
|
if err := gs.Serve(lis); err != nil {
|
||||||
log.Printf("Nezha compat gRPC server stopped: %v", err)
|
log.Printf("Nezha compat gRPC server stopped: %v", err)
|
||||||
@@ -118,15 +116,14 @@ func StopNezhaCompat() error {
|
|||||||
if nezhaSrv == nil {
|
if nezhaSrv == nil {
|
||||||
return errors.New("nezha compat server not running")
|
return errors.New("nezha compat server not running")
|
||||||
}
|
}
|
||||||
// GracefulStop allows inflight RPCs to finish.
|
// 强制立即断开所有连接与流,不等待在途 RPC 完成。
|
||||||
nezhaSrv.GracefulStop()
|
nezhaSrv.Stop()
|
||||||
// Listener close (Serve already returns after GracefulStop, but close to be explicit)
|
// Listener close (Serve already returns after GracefulStop, but close to be explicit)
|
||||||
if nezhaLis != nil {
|
if nezhaLis != nil {
|
||||||
_ = nezhaLis.Close()
|
_ = nezhaLis.Close()
|
||||||
}
|
}
|
||||||
nezhaSrv = nil
|
nezhaSrv = nil
|
||||||
nezhaLis = nil
|
nezhaLis = nil
|
||||||
nezhaBoot = 0
|
|
||||||
log.Printf("Nezha compat gRPC stopped")
|
log.Printf("Nezha compat gRPC stopped")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user