particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

worker: remoteAddress → address

Browse source
This commit is contained in:
Lars Karlitski 2020-03-25 02:45:59 +01:00 • committed by Tom Gundersen
parent 94183d14a8
commit cb4421b69f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/osbuild-worker/main.go
View file

@ -56,7 +56,7 @@ func createTLSConfig(config *connectionConfig) (*tls.Config, error) {
}, nil
}
func NewClient(remoteAddress string, conf *tls.Config) *ComposerClient {
func NewClient(address string, conf *tls.Config) *ComposerClient {
client := &http.Client{
Transport: &http.Transport{
TLSClientConfig: conf,
@ -70,7 +70,7 @@ func NewClient(remoteAddress string, conf *tls.Config) *ComposerClient {
scheme = "https"
}
return &ComposerClient{client, scheme, remoteAddress}
return &ComposerClient{client, scheme, address}
}
func NewClientUnix(path string) *ComposerClient {
@ -177,13 +177,13 @@ func handleJob(client *ComposerClient) error {
}
func main() {
var remoteAddress string
flag.StringVar(&remoteAddress, "remote", "", "Connect to a remote composer using the specified address")
var address string
flag.StringVar(&address, "remote", "", "Connect to a remote composer using the specified address")
flag.Parse()
var client *ComposerClient
if remoteAddress != "" {
remoteAddress = fmt.Sprintf("%s:%d", remoteAddress, RemoteWorkerPort)
if address != "" {
address = fmt.Sprintf("%s:%d", address, RemoteWorkerPort)
conf, err := createTLSConfig(&connectionConfig{
CACertFile: "/etc/osbuild-composer/ca-crt.pem",
@ -194,7 +194,7 @@ func main() {
log.Fatalf("Error creating TLS config: %v", err)
}
client = NewClient(remoteAddress, conf)
client = NewClient(address, conf)
} else {
client = NewClientUnix("/run/osbuild-composer/job.socket")
}