From b16eb76b835f28b511af80b5a979d019a6bd33d5 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 4 Feb 2016 01:49:27 +0100 Subject: Remove concurancy for now --- cmd/acme/main.go | 40 ++++++++++++++++------------------------ 1 file 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() } -- cgit v1.2.3