15954: Fix up logging prefix.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 784428b352fa55270b880ce6138b70e81a208942..de570a952066397576ca99ceaffe8b8d713cb2f3 100644 (file)
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -412,9 +412,9 @@ func (super *Supervisor) RunProgram(ctx context.Context, dir string, output io.W
        super.logger.WithField("command", cmdline).WithField("dir", dir).Info("executing")
 
        logprefix := strings.TrimPrefix(prog, super.tempdir+"/bin/")
-       if prog == "bundle" && len(args) > 2 && args[0] == "exec" {
+       if logprefix == "bundle" && len(args) > 2 && args[0] == "exec" {
                logprefix = args[1]
-       } else if prog == "arvados-server" && len(args) > 1 {
+       } else if logprefix == "arvados-server" && len(args) > 1 {
                logprefix = args[0]
        }
        if !strings.HasPrefix(dir, "/") {