From a097b6db8f572f661f9135d504487f84a5aa9bff Mon Sep 17 00:00:00 2001 From: Hugo Vieira Date: Mon, 6 Dec 2021 10:39:01 +0000 Subject: [PATCH] fix(server): Duplicated Worker nil check inside Worker nil check stmt --- internal/cmd/commands/server/server.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/cmd/commands/server/server.go b/internal/cmd/commands/server/server.go index 4e5eeb7c7..a64437188 100644 --- a/internal/cmd/commands/server/server.go +++ b/internal/cmd/commands/server/server.go @@ -270,14 +270,12 @@ func (c *Command) Run(args []string) int { return base.CommandUserError } - if c.Config.Worker != nil { - if err := c.SetupWorkerPublicAddress(c.Config, ""); err != nil { - c.UI.Error(err.Error()) - return base.CommandUserError - } - c.InfoKeys = append(c.InfoKeys, "worker public proxy addr") - c.Info["worker public proxy addr"] = c.Config.Worker.PublicAddr + if err := c.SetupWorkerPublicAddress(c.Config, ""); err != nil { + c.UI.Error(err.Error()) + return base.CommandUserError } + c.InfoKeys = append(c.InfoKeys, "worker public proxy addr") + c.Info["worker public proxy addr"] = c.Config.Worker.PublicAddr if c.Config.Controller != nil { switch len(c.Config.Worker.Controllers) {