From 465642b249558fb84f4e71e7783365e31b59217d Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 26 Apr 2022 19:11:55 -0700 Subject: [PATCH] control/controlclient: fix log print with always-empty key In debugging #4541, I noticed this log print was always empty. The value printed was always zero at this point. Updates #4541 Change-Id: I0eef60c32717c293c1c853879446be65d9b2cef6 Signed-off-by: Brad Fitzpatrick (cherry picked from commit adcb7e59d2b2d923c95a295f18ff9606b92ebea0) --- control/controlclient/direct.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go index 83a666c84..c4535a7f7 100644 --- a/control/controlclient/direct.go +++ b/control/controlclient/direct.go @@ -376,7 +376,7 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new if err != nil { return regen, opt.URL, err } - c.logf("control server key %s from %s", serverKey.ShortString(), c.serverURL) + c.logf("control server key from %s: ts2021=%s, legacy=%v", c.serverURL, keys.PublicKey.ShortString(), keys.LegacyPublicKey.ShortString()) c.mu.Lock() c.serverKey = keys.LegacyPublicKey