From b374dbf6b4ec13421570fa13ecebc6b23e19dbab Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@tomclegg.ca>
Date: Mon, 24 Feb 2020 10:42:07 -0500
Subject: [PATCH] 15954: Trim log prefix.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---
 lib/boot/cmd.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index a360a0b4ee..bf78c42d70 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -465,7 +465,7 @@ func (boot *Booter) RunProgram(ctx context.Context, dir string, output io.Writer
 	cmdline := fmt.Sprintf("%s", append([]string{prog}, args...))
 	boot.logger.WithField("command", cmdline).WithField("dir", dir).Info("executing")
 
-	logprefix := prog
+	logprefix := strings.TrimPrefix(prog, boot.tempdir+"/bin/")
 	if prog == "bundle" && len(args) > 2 && args[0] == "exec" {
 		logprefix = args[1]
 	} else if prog == "arvados-server" && len(args) > 1 {
-- 
2.30.2