Merge pull request #58 from ferringb/master

Fix regression introduced in 1.6.1 inducing actions being continually ran upon remote CA change

cert/cert.go

@@ -80,8 +80,6 @@ func (ca *CA) writeCert(cert []byte) error {
 	}
 	log.Infof("cert: wrote CA certificate: %s", ca.File.Path)
 
-	// see CA.Load(); strip prefix/trailing whitespace to ensure our bytes.Equal() checks don't false positive.
-	ca.pem = []byte(strings.TrimSpace(string(cert[:])))
 	err = ca.File.Set()
 	return err
 }
@@ -132,6 +130,11 @@ func (ca *CA) Refresh() (bool, error) {
 	if ca.File != nil {
 		err = ca.writeCert(cert)
 	}
+	// If there were no errors, update our internal notion of what the CA is.
+	if err != nil {
+		// see CA.Load(); strip prefix/trailing whitespace to ensure our bytes.Equal() checks don't false positive.
+		ca.pem = []byte(strings.TrimSpace(string(cert[:])))
+	}
 
 	return true, err
 }

mgr/manager.go

@@ -29,6 +29,7 @@ type CertServiceManager struct {
 }
 
 func (csm *CertServiceManager) TakeAction(change_type string) error {
+	log.Infof("manager: executing configured action due to change type %s for %s", change_type, csm.Cert.Path)
 	ca_path := ""
 	if csm.CA.File != nil {
 		ca_path = csm.CA.File.Path