exec:support to set custom log path

Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>

Author: ningmingxiao

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
           path: src/github.com/containerd/go-runc
           fetch-depth: 25
 
-      - uses: containerd/project-checks@v1.1.0
+      - uses: containerd/project-checks@d7751f3c375b8fe4a84c02a068184ee4c1f59bc4 # v1.2.2
         with:
           working-directory: src/github.com/containerd/go-runc
 

command_linux.go

@@ -25,11 +25,15 @@ import (
 )
 
 func (r *Runc) command(context context.Context, args ...string) *exec.Cmd {
+	return r.commandWithCustomLogPath(context, "", args...)
+}
+
+func (r *Runc) commandWithCustomLogPath(context context.Context, logPath string, args ...string) *exec.Cmd {
 	command := r.Command
 	if command == "" {
 		command = DefaultCommand
 	}
-	cmd := exec.CommandContext(context, command, append(r.args(), args...)...)
+	cmd := exec.CommandContext(context, command, append(r.args(logPath), args...)...)
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Setpgid: r.Setpgid,
 	}

command_other.go

@@ -25,11 +25,15 @@ import (
 )
 
 func (r *Runc) command(context context.Context, args ...string) *exec.Cmd {
+	return r.commandWithCustomLogPath(context, "", args...)
+}
+
+func (r *Runc) commandWithCustomLogPath(context context.Context, logPath string, args ...string) *exec.Cmd {
 	command := r.Command
 	if command == "" {
 		command = DefaultCommand
 	}
-	cmd := exec.CommandContext(context, command, append(r.args(), args...)...)
+	cmd := exec.CommandContext(context, command, append(r.args(logPath), args...)...)
 	cmd.Env = os.Environ()
 	return cmd
 }

runc.go

@@ -228,6 +228,7 @@ func (r *Runc) Start(context context.Context, id string) error {
 // ExecOpts holds optional settings when starting an exec process with runc
 type ExecOpts struct {
 	IO
+	LogPath       string
 	PidFile       string
 	ConsoleSocket ConsoleSocket
 	Detach        bool
@@ -280,7 +281,7 @@ func (r *Runc) Exec(context context.Context, id string, spec specs.Process, opts
 		return err
 	}
 	args = append(args, oargs...)
-	cmd := r.command(context, append(args, id)...)
+	cmd := r.commandWithCustomLogPath(context, opts.LogPath, append(args, id)...)
 	if opts.IO != nil {
 		opts.Set(cmd)
 	}
@@ -765,15 +766,20 @@ func (r *Runc) Features(context context.Context) (*features.Features, error) {
 	return &feat, nil
 }
 
-func (r *Runc) args() (out []string) {
+func (r *Runc) args(logPath string) (out []string) {
 	if r.Root != "" {
 		out = append(out, "--root", r.Root)
 	}
 	if r.Debug {
 		out = append(out, "--debug")
 	}
 	if r.Log != "" {
-		out = append(out, "--log", r.Log)
+		if logPath == "" {
+			out = append(out, "--log", r.Log)
+		}
+	}
+	if logPath != "" {
+		out = append(out, "--log", logPath)
 	}
 	if r.LogFormat != none {
 		out = append(out, "--log-format", string(r.LogFormat))

runc_test.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"strings"
 	"sync"
 	"syscall"
 	"testing"
@@ -336,6 +337,32 @@ func TestCreateArgs(t *testing.T) {
 	}
 }
 
+func TestExecWithLogPath(t *testing.T) {
+	o := &Runc{}
+	out := o.args("/tmp/exec.log")
+	if strings.Join(out, " ") != "--log /tmp/exec.log" {
+		t.Fatalf("should be :--log /tmp/exec.log but got :%s", strings.Join(out, " "))
+	}
+
+	o = &Runc{Log: "/tmp/runc.log"}
+	out = o.args("/tmp/exec.log")
+	if strings.Join(out, " ") != "--log /tmp/exec.log" {
+		t.Fatalf("should be :--log /tmp/exec.log but got :%s", strings.Join(out, " "))
+	}
+
+	o = &Runc{Log: "/tmp/runc.log"}
+	out = o.args("")
+	if strings.Join(out, " ") != "--log /tmp/runc.log" {
+		t.Fatalf("should be :--log /tmp/runc.log but got :%s", strings.Join(out, " "))
+	}
+
+	o = &Runc{}
+	out = o.args("")
+	if len(out) != 0 {
+		t.Fatalf("len(out) should be 0 but got :%d", len(out))
+	}
+}
+
 func TestRuncFeatures(t *testing.T) {
 	ctx := context.Background()
 	if _, err := exec.LookPath(DefaultCommand); err != nil {