17175: Fix logging label for setuidgid-wrapped procs.
authorTom Clegg <tom@curii.com>
Mon, 28 Dec 2020 20:21:04 +0000 (15:21 -0500)
committerTom Clegg <tom@curii.com>
Mon, 28 Dec 2020 20:21:04 +0000 (15:21 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/boot/supervisor.go

index 1e8e83ff3b3327005fb545f39c2ab8d357409fdf..a85a699c3cd1df0a4fb19068e4d764ebdbbf82ca 100644 (file)
@@ -451,8 +451,8 @@ func (super *Supervisor) RunProgram(ctx context.Context, dir string, output io.W
        super.logger.WithField("command", cmdline).WithField("dir", dir).Info("executing")
 
        logprefix := prog
-       if logprefix == "setuidgid" && len(args) >= 3 {
-               logprefix = args[2]
+       if logprefix == "setuidgid" && len(args) >= 2 {
+               logprefix = args[1]
        }
        logprefix = strings.TrimPrefix(logprefix, super.tempdir+"/bin/")
        if logprefix == "bundle" && len(args) > 2 && args[0] == "exec" {