Merge pull request #5906 from thaJeztah/replace_os_exec

This commit is contained in:
Fu Wei
2021-09-11 10:38:53 +08:00
committed by GitHub
41 changed files with 166 additions and 66 deletions

View File

@@ -25,7 +25,6 @@ import (
"io"
"net/url"
"os"
"os/exec"
"path/filepath"
"sync"
"sync/atomic"
@@ -39,6 +38,7 @@ import (
runc "github.com/containerd/go-runc"
"github.com/hashicorp/go-multierror"
"github.com/pkg/errors"
exec "golang.org/x/sys/execabs"
)
const binaryIOProcTermTimeout = 12 * time.Second // Give logger process solid 10 seconds for cleanup

View File

@@ -19,7 +19,8 @@ package process
import (
"net/url"
"os"
"os/exec"
exec "golang.org/x/sys/execabs"
)
// NewBinaryCmd returns a Cmd to be used to start a logging binary.