17398: Skip gateway server if dispatcher does not send desired addr.
authorTom Clegg <tom@curii.com>
Thu, 18 Feb 2021 16:43:27 +0000 (11:43 -0500)
committerTom Clegg <tom@curii.com>
Thu, 18 Feb 2021 16:43:27 +0000 (11:43 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/crunchrun/crunchrun.go

index 7d6fb4ed47bef547f4eb3cb1728163c77021bf02..969682f465cefe56a0430b80bef2a461d7022436 100644 (file)
@@ -1887,10 +1887,12 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
                Log:               cr.CrunchLog,
        }
        os.Unsetenv("GatewayAuthSecret")
-       err = cr.gateway.Start()
-       if err != nil {
-               log.Printf("error starting gateway server: %s", err)
-               return 1
+       if cr.gateway.Address != "" {
+               err = cr.gateway.Start()
+               if err != nil {
+                       log.Printf("error starting gateway server: %s", err)
+                       return 1
+               }
        }
 
        parentTemp, tmperr := cr.MkTempDir("", "crunch-run."+containerID+".")