cmd: fix process leak after timeout

zperf · Dec 19, 2023 · e839816 · e839816
1 parent c049108
commit e839816
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tcpmon/collector/nic.go b/tcpmon/collector/nic.go
@@ -40,7 +40,8 @@ func (m *NicCollector) doCollect(now time.Time) (*gproto.NicMetric, error) {
 
 	select {
 	case <-ctx.Done():
-		return nil, errors.Wrap(ctx.Err(), "ifconfig timeout")
+		err := c.Stop()
+		return nil, errors.Wrap(errors.CombineErrors(ctx.Err(), err), "ifconfig timeout")
 	case st := <-c.Start():
 		var nics gproto.NicMetric
 		nics.Type = gproto.MetricType_NIC

diff --git a/tcpmon/collector/socket.go b/tcpmon/collector/socket.go
@@ -43,7 +43,8 @@ func (m *SocketCollector) doCollect(now time.Time) (*gproto.TcpMetric, error) {
 
 	select {
 	case <-ctx.Done():
-		return nil, errors.Wrap(ctx.Err(), "ss timeout")
+		err := c.Stop()
+		return nil, errors.Wrap(errors.CombineErrors(ctx.Err(), err), "ss timeout")
 
 	case st := <-c.Start():
 		var t gproto.TcpMetric