From 72795b376c46e1b352683b51b233c5d80a8b31ca Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 1 Mar 2016 15:46:18 +0100 Subject: Split getAccount --- cmd/acme/main.go | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 1c7c201..c6aae36 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -54,16 +54,9 @@ func main() { for _, v := range v.Account { log.Println("Load", v.KeyFile) - acc, err := acme.LoadAccount(v.KeyFile) + acc, err := getAccount(v.KeyFile) if err != nil { - log.Println("New", v.KeyFile) - acc, err = acme.NewAccount(v.KeySize) - if err != nil { - log.Fatal(err) - } - if err := acc.Save(v.KeyFile); err != nil { - log.Fatal(err) - } + log.Fatal(err) } con := acme.Contacts{} con.AddMail(v.Mail) @@ -107,3 +100,17 @@ func main() { } } } + +func getAccount(keyFile string) (*acme.Account, error) { + acc, err := acme.LoadAccount(keyFile) + if err == nil { + return acc, nil + } + + acc, err = acme.NewAccount(v.KeySize) + if err != nil { + return nil, err + } + + return acc, acc.Save(keyFile) +} -- cgit v1.2.3