services: fix timer draining

Ref. #3736. Signed-off-by: Anna Shaleva <[email protected]>
nspcc-dev · Dec 9, 2024 · 827acfc · 827acfc
1 parent 35c2c5c
commit 827acfc
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pkg/services/rpcsrv/server.go b/pkg/services/rpcsrv/server.go
@@ -471,7 +471,10 @@ func (s *Server) Shutdown() {
 			session.iteratorsLock.Lock()
 			session.finalize()
 			if !session.timer.Stop() {
-				<-session.timer.C
+				select {
+				case <-session.timer.C:
+				default:
+				}
 			}
 			session.iteratorsLock.Unlock()
 		}
@@ -2596,7 +2599,10 @@ func (s *Server) terminateSession(reqParams params.Params) (any, *neorpc.Error)
 	session.iteratorsLock.Lock()
 	session.finalize()
 	if !session.timer.Stop() {
-		<-session.timer.C
+		select {
+		case <-session.timer.C:
+		default:
+		}
 	}
 	delete(s.sessions, strSID)
 	session.iteratorsLock.Unlock()