From 750ff49897b96edf5e4460ac30d7c1da87eaf4d7 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 10 Mar 2016 01:46:28 +0100 Subject: Remove WaitGroup for now --- cmd/acme/main.go | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index c701bc7..79bf0c2 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -4,7 +4,6 @@ package main import ( "flag" "log" - "sync" "dim13.org/acme" ) @@ -21,17 +20,11 @@ func dialProvider(p provider) error { if err != nil { return err } - wg := sync.WaitGroup{} for _, a := range p.Account { - wg.Add(1) - go func(a account) { - defer wg.Done() - if err := loadAccount(prov, a); err != nil { - log.Println(err) - } - }(a) - } - wg.Wait() + if err := loadAccount(prov, a); err != nil { + return err + } + } return nil } @@ -66,17 +59,11 @@ func loadAccount(prov *acme.Provider, a account) error { } } - wg := sync.WaitGroup{} for _, d := range a.Domain { - wg.Add(1) - go func(d domain) { - defer wg.Done() - if err := requestCert(prov, acc, d); err != nil { - log.Println(err) - } - }(d) - } - wg.Wait() + if err := requestCert(prov, acc, d); err != nil { + return err + } + } return nil } @@ -105,18 +92,12 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error { des.RegisterSolver(tlsSol) } - wg := sync.WaitGroup{} for _, an := range d.Altnames { - wg.Add(1) - go func(an string) { - defer wg.Done() - log.Println("Authorize", an) - if err := prov.Authorize(acc, des, an); err != nil { - log.Println(err) - } - }(an) - } - wg.Wait() + log.Println("Authorize", an) + if err := prov.Authorize(acc, des, an); err != nil { + return err + } + } log.Println("Request bundle for", d.Altnames) cert, err := prov.Bundle(acc, des) -- cgit v1.2.3