From 2ce89488b20aaa6d1464e824b6e2e8ab2f9aceb4 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 12 Mar 2016 13:32:31 +0100 Subject: Move renew check into clousure --- cmd/acme/main.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index ffa74c9..67838f7 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -4,6 +4,7 @@ package main import ( "flag" "log" + "time" "dim13.org/acme" ) @@ -90,7 +91,13 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error { return err } } - if !d.needsRenew(c.Leaf) && !*forceRenew { + needsRenew := func() bool { + if c.Leaf == nil { + return true + } + return time.Now().Add(d.Gracetime).After(c.Leaf.NotAfter) + } + if !needsRenew() && !*forceRenew { log.Println("skip valid until", c.Leaf.NotAfter) return nil } -- cgit v1.2.3