Simplfy subprocess Stop & remove useless test (ava-labs#2652)

multisig-labs · Feb 24, 2023 · 75a3815 · 75a3815
1 parent 9f42ae0
commit 75a3815
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 32 deletions.
diff --git a/utils/ulimit/ulimit_test.go b/utils/ulimit/ulimit_test.go
diff --git a/vms/rpcchainvm/runtime/subprocess/stopper.go b/vms/rpcchainvm/runtime/subprocess/stopper.go
@@ -20,22 +20,13 @@ func NewStopper(logger logging.Logger, cmd *exec.Cmd) runtime.Stopper {
 }
 
 type stopper struct {
-	lock     sync.Mutex
-	cmd      *exec.Cmd
-	shutdown bool
-
+	once   sync.Once
+	cmd    *exec.Cmd
 	logger logging.Logger
 }
 
 func (s *stopper) Stop(ctx context.Context) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	// subsequent calls to this method are a no-op
-	if s.shutdown || s.cmd.Process == nil {
-		return
-	}
-
-	s.shutdown = true
-	stop(ctx, s.logger, s.cmd)
+	s.once.Do(func() {
+		stop(ctx, s.logger, s.cmd)
+	})
 }