From ac97165f81fdfd6284e2307c7b521ea5979523fd Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Tue, 17 Feb 2026 17:29:03 +0200 Subject: [PATCH] return error from UnregisterName wrappers --- cores/server.go | 8 ++++---- services/dispatchers.go | 2 +- services/sessions.go | 2 +- services/thresholds.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cores/server.go b/cores/server.go index 0f60553e8..11d996323 100644 --- a/cores/server.go +++ b/cores/server.go @@ -85,8 +85,8 @@ func (s *Server) RpcRegisterName(name string, rcvr any) { s.Unlock() } -func (s *Server) RpcUnregisterName(name string) { - s.rpcSrv.UnregisterName(name) +func (s *Server) RpcUnregisterName(name string) error { + return s.rpcSrv.UnregisterName(name) } func (s *Server) RegisterHttpFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) { @@ -118,8 +118,8 @@ func (s *Server) BiRPCRegisterName(name string, rcvr any) { s.birpcSrv.RegisterName(name, rcvr) } -func (s *Server) BiRPCUnregisterName(name string) { - s.birpcSrv.UnregisterName(name) +func (s *Server) BiRPCUnregisterName(name string) error { + return s.birpcSrv.UnregisterName(name) } func (s *Server) serveCodec(addr, codecName string, newCodec func(conn conn, caps *engine.Caps, anz *analyzers.AnalyzerService) birpc.ServerCodec, diff --git a/services/dispatchers.go b/services/dispatchers.go index ce38ec46a..c26764e9e 100644 --- a/services/dispatchers.go +++ b/services/dispatchers.go @@ -88,7 +88,7 @@ func (dspS *DispatcherService) Start() error { dspS.dspS = dispatchers.NewDispatcherService(datadb, dspS.cfg, fltrS, dspS.connMgr) - dspS.server.RpcUnregisterName(utils.AttributeSv1) + _ = dspS.server.RpcUnregisterName(utils.AttributeSv1) srv, err := newDispatcherServiceMap(dspS.dspS) if err != nil { diff --git a/services/sessions.go b/services/sessions.go index db7f1a9ae..a8ffc1c1e 100644 --- a/services/sessions.go +++ b/services/sessions.go @@ -130,7 +130,7 @@ func (smg *SessionService) Shutdown() (err error) { return err } if smg.cfg.ListenCfg().BiJSONListen != "" { - smg.server.BiRPCUnregisterName(utils.SessionSv1) + _ = smg.server.BiRPCUnregisterName(utils.SessionSv1) } smg.sm = nil <-smg.connChan diff --git a/services/thresholds.go b/services/thresholds.go index f34865ce8..1500a8028 100644 --- a/services/thresholds.go +++ b/services/thresholds.go @@ -118,7 +118,7 @@ func (thrs *ThresholdService) Shutdown() (err error) { defer thrs.Unlock() thrs.thrs.Shutdown() if thrs.cfg.ListenCfg().BiJSONListen != "" { - thrs.server.BiRPCUnregisterName(utils.ThresholdSv1) + _ = thrs.server.BiRPCUnregisterName(utils.ThresholdSv1) } thrs.thrs = nil <-thrs.connChan