aboutsummaryrefslogtreecommitdiff
path: root/provider.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-25 19:29:22 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-25 19:29:22 +0100
commit8a10a24ae109963e7d988af342ff997e28c3430f (patch)
tree2befcbdbdfbe58e646a04a313a22c70b9a724c19 /provider.go
parent2b6ee482ad38012fb1c477c2e591eab74bd66eb6 (diff)
Reduce
Diffstat (limited to 'provider.go')
-rw-r--r--provider.go29
1 files changed, 10 insertions, 19 deletions
diff --git a/provider.go b/provider.go
index f09ffdf..9c7e6f1 100644
--- a/provider.go
+++ b/provider.go
@@ -226,34 +226,25 @@ func (p *Provider) pollStatus(uri string) error {
t := time.NewTicker(p.poll)
defer t.Stop()
for range t.C {
- done, err := p.queryStatus(uri)
+ resp, err := p.Get(uri)
if err != nil {
return err
}
- if done {
+ r := new(Challenge)
+ err = parseJson(resp, r)
+ if err != nil {
+ return err
+ }
+ if r.Err != nil {
+ return r.Err
+ }
+ if r.Status == StatusValid {
return nil
}
}
return nil
}
-func (p *Provider) queryStatus(uri string) (bool, error) {
- resp, err := p.Get(uri)
- if err != nil {
- return false, err
- }
- r := new(Challenge)
- err = parseJson(resp, r)
- if err != nil {
- return false, err
- }
- log.Println("status", r.Status)
- if r.Err != nil {
- return false, r.Err
- }
- return r.Status == StatusValid, nil
-}
-
func (p *Provider) Bundle(s Signer, d *Desire) error {
// first step: post csr
csr, err := d.CSR()