From 1e28cc43c5691f90aae4d2b77e5ecaf52432f2eb Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 25 Dec 2015 16:03:37 +0100 Subject: timeout --- client.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'client.go') diff --git a/client.go b/client.go index 7a1de7c..c7b4877 100644 --- a/client.go +++ b/client.go @@ -246,21 +246,13 @@ func (c *Client) Authorize(a *Account, altnames []string) error { s = &httpChallenge{Addr: "localhost:8080", Challenge: *ans} } - errc := make(chan error) - go func() { - if err := Solve(s); err != nil { - errc <- err - } - }() - select { - case err = <-errc: + if err := Solve(s, time.Minute); err != nil { return err - case <-time.After(5 * time.Second): - return errTimedOut } ns := parseHeader(resp) done := make(chan bool) + errc := make(chan error) log.Println(ansi.Color("NextStep", "green"), ns) ticker := time.NewTicker(time.Second) defer ticker.Stop() @@ -276,7 +268,7 @@ func (c *Client) Authorize(a *Account, altnames []string) error { select { case <-done: case err = <-errc: - case <-time.After(5 * time.Second): + case <-time.After(30 * time.Second): return errTimedOut } -- cgit v1.2.3