opensourcemirror
/
concourse
mirror of https://github.com/concourse/concourse.git
1
0
Fork 0
Code Issues Releases Wiki Activity

--external-garden-address -> --external-garden-url 

Signed-off-by: Alex Suraci <suraci.alex@gmail.com>
This commit is contained in:
Alex Suraci 2019-05-14 14:20:43 -04:00
parent ae90d5052d
commit a85d4bf93a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/concourse/worker.go
View File

@ -50,7 +50,7 @@ type WorkerCommand struct {
Garden GardenBackend `group:"Garden Configuration" namespace:"garden"`
ExternalGardenAddress flag.URL `long:"external-garden-address" description:"garden server connection address, when specified will not use embedded garden"`
ExternalGardenURL flag.URL `long:"external-garden-url" description:"API endpoint of an externally managed Garden server to use instead of running the embedded Garden server."`
Baggageclaim baggageclaimcmd.BaggageclaimCommand `group:"Baggageclaim Configuration" namespace:"baggageclaim"`
@ -206,13 +206,14 @@ func (cmd *WorkerCommand) Runner(args []string) (ifrit.Runner, error) {
}
func (cmd *WorkerCommand) gardenIsExternal() bool {
return cmd.ExternalGardenAddress.URL != nil
return cmd.ExternalGardenURL.URL != nil
}
func (cmd *WorkerCommand) gardenAddr() string {
if cmd.gardenIsExternal() {
return cmd.ExternalGardenAddress.URL.Host
return cmd.ExternalGardenURL.URL.Host
}
return fmt.Sprintf("%s:%d", cmd.BindIP, cmd.BindPort)
}