Parcourir la source

daemon: translateContainerdStartErr(): remove unused cmd argument

This argument was no longer used since commit 225e046d9d1bdf0f06f4c97bef239b5909463885

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn il y a 3 ans
Parent
commit
2cf09c5446
4 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 1 1
      daemon/errors.go
  2. 1 1
      daemon/exec.go
  3. 2 2
      daemon/start.go
  4. 1 1
      daemon/start_unix.go

+ 1 - 1
daemon/errors.go

@@ -132,7 +132,7 @@ func (e startInvalidConfigError) Error() string {
 
 func (e startInvalidConfigError) InvalidParameter() {} // Is this right???
 
-func translateContainerdStartErr(cmd string, setExitCode func(int), err error) error {
+func translateContainerdStartErr(setExitCode func(int), err error) error {
 	errDesc := status.Convert(err).Message()
 	contains := func(s1, s2 string) bool {
 		return strings.Contains(strings.ToLower(s1), s2)

+ 1 - 1
daemon/exec.go

@@ -288,7 +288,7 @@ func (daemon *Daemon) ContainerExecStart(ctx context.Context, name string, optio
 	close(ec.Started)
 	if err != nil {
 		defer ec.Unlock()
-		return translateContainerdStartErr(ec.Entrypoint, ec.SetExitCode, err)
+		return translateContainerdStartErr(ec.SetExitCode, err)
 	}
 	ec.Unlock()
 

+ 2 - 2
daemon/start.go

@@ -179,7 +179,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C
 
 	ctr, err := libcontainerd.ReplaceContainer(ctx, daemon.containerd, container.ID, spec, shim, createOptions)
 	if err != nil {
-		return translateContainerdStartErr(container.Path, container.SetExitCode, err)
+		return translateContainerdStartErr(container.SetExitCode, err)
 	}
 
 	// TODO(mlaventure): we need to specify checkpoint options here
@@ -191,7 +191,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C
 			logrus.WithError(err).WithField("container", container.ID).
 				Error("failed to delete failed start container")
 		}
-		return translateContainerdStartErr(container.Path, container.SetExitCode, err)
+		return translateContainerdStartErr(container.SetExitCode, err)
 	}
 
 	container.HasBeenManuallyRestarted = false

+ 1 - 1
daemon/start_unix.go

@@ -17,7 +17,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
 
 	rt, err := daemon.getRuntime(container.HostConfig.Runtime)
 	if err != nil {
-		return "", nil, translateContainerdStartErr(container.Path, container.SetExitCode, err)
+		return "", nil, translateContainerdStartErr(container.SetExitCode, err)
 	}
 
 	return rt.Shim.Binary, rt.Shim.Opts, nil