aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-02-04 01:49:27 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-02-04 01:49:27 +0100
commitb16eb76b835f28b511af80b5a979d019a6bd33d5 (patch)
tree36a31142e98aa51a5e0f5f56eada65438d5e37da
parent790f02ebf87e2e898ddd4c5c410a213857474bc6 (diff)
Remove concurancy for now
-rw-r--r--cmd/acme/main.go40
1 files changed, 16 insertions, 24 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 2b42356..9a0f87d 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -6,7 +6,6 @@ import (
"log"
"os"
"runtime/trace"
- "sync"
"dim13.org/acme"
)
@@ -92,23 +91,21 @@ func main() {
}
// register accs first
- wg := sync.WaitGroup{}
for k, des := range conf.Desire {
if des.account.registered {
continue
}
- wg.Add(1)
- go func(name string, acc *account) {
- log.Println("register", name)
- des.provider.Register(acc, acc.Contacts)
- des.account.registered = true
- wg.Done()
- }(k, des.account)
+ log.Println("register", k)
+ err := des.provider.Register(des.account, des.account.Contacts)
+ if err != nil {
+ log.Fatal(err)
+ }
+ des.account.registered = true
}
- wg.Wait()
// satisfice
for k, des := range conf.Desire {
+ log.Println("satisfice", k)
if des.Webroot != "" {
wrSol := acme.NewWebrootSolver(des.Webroot)
des.RegisterSolver(wrSol)
@@ -122,19 +119,14 @@ func main() {
log.Fatal("no Solver available")
}
- wg.Add(1)
- go func(name string, des *desire) {
- if err := des.provider.Authorize(des.account, des.Desire); err != nil {
- log.Fatal(err)
- }
- if err := des.provider.Bundle(des.account, des.Desire); err != nil {
- log.Fatal(err)
- }
- if err := des.Save(des.Cert, des.Key); err != nil {
- log.Fatal(err)
- }
- wg.Done()
- }(k, des)
+ if err := des.provider.Authorize(des.account, des.Desire); err != nil {
+ log.Fatal(err)
+ }
+ if err := des.provider.Bundle(des.account, des.Desire); err != nil {
+ log.Fatal(err)
+ }
+ if err := des.Save(des.Cert, des.Key); err != nil {
+ log.Fatal(err)
+ }
}
- wg.Wait()
}