Improve logging

2 files changed, 5 insertions, 5 deletions

diff --git a/client/go/cmd/helpers.go b/client/go/cmd/helpers.go
index f065ae0c680..add81334d35 100644
--- a/client/go/cmd/helpers.go
+++ b/client/go/cmd/helpers.go
@@ -134,11 +134,11 @@ func getService(service string, sessionOrRunID int64, cluster string) *vespa.Ser
 	t := getTarget()
 	timeout := time.Duration(waitSecsArg) * time.Second
 	if timeout > 0 {
-		log.Printf("Waiting up to %d %s for service to become available ...", color.Cyan(waitSecsArg), color.Cyan("seconds"))
+		log.Printf("Waiting up to %d %s for %s service to become available ...", color.Cyan(waitSecsArg), color.Cyan("seconds"), color.Cyan(service))
 	}
 	s, err := t.Service(service, timeout, sessionOrRunID, cluster)
 	if err != nil {
-		fatalErr(err, "Invalid service: ", service)
+		fatalErr(err, "Service not found: ", service)
 	}
 	return s
 }
diff --git a/client/go/vespa/target.go b/client/go/vespa/target.go
index 204dda6538f..747fd2d345e 100644
--- a/client/go/vespa/target.go
+++ b/client/go/vespa/target.go
@@ -31,7 +31,7 @@ const (
 	queryService    = "query"
 	documentService = "document"
 
-	waitRetryInterval = 2 * time.Second
+	retryInterval = 2 * time.Second
 )
 
 // Service represents a Vespa service.
@@ -563,10 +563,10 @@ func wait(fn responseFunc, reqFn requestFunc, certificate *tls.Certificate, time
 			}
 		}
 		timeLeft := deadline.Sub(time.Now())
-		if loopOnce || timeLeft < waitRetryInterval {
+		if loopOnce || timeLeft < retryInterval {
 			break
 		}
-		time.Sleep(waitRetryInterval)
+		time.Sleep(retryInterval)
 	}
 	return statusCode, httpErr
 }