aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-10 01:46:28 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-10 01:46:28 +0100
commit750ff49897b96edf5e4460ac30d7c1da87eaf4d7 (patch)
tree2b2d425b14c3d2723c3f66203957c5721427b1e9 /cmd
parent7dc46aa51f6664102fd997762cea3f67ffc3024b (diff)
Remove WaitGroup for now
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go45
1 files changed, 13 insertions, 32 deletions
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)