letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crl-storer: simplify S3 error handling (#6417) 

Currently, we refuse to error out when checking the error from
S3, to ensure that we can update the metrics appropriately. This
requires us to use an unconventional error-checking structure,
and to check the error again when it comes time to return.

Instead, move the metrics above the error check, and then make
the error check a more traditional structure.
This commit is contained in:
Aaron Gable 2022-10-03 11:55:27 -07:00 committed by GitHub
parent d41dc3a51e
commit 014c15ba61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crl/storer/storer.go
View File

@ -166,23 +166,21 @@ func (cs *crlStorer) UploadCRL(stream cspb.CRLStorer_UploadCRLServer) error {
ContentType: &crlContentType,
Metadata: map[string]string{"crlNumber": crlNumber.String()},
})
if err != nil {
cs.uploadCount.WithLabelValues(issuer.Subject.CommonName, "failed").Inc()
cs.log.AuditErrf("CRL upload failed: id=[%s] err=[%s]", crlId, err)
} else {
cs.uploadCount.WithLabelValues(issuer.Subject.CommonName, "success").Inc()
cs.log.AuditInfof(
"CRL uploaded: id=[%s] issuerCN=[%s] thisUpdate=[%s] nextUpdate=[%s] numEntries=[%d]",
crlId, issuer.Subject.CommonName, crl.ThisUpdate, crl.NextUpdate, len(crl.RevokedCertificates),
)
}
latency := cs.clk.Now().Sub(start)
cs.latencyHistogram.WithLabelValues(issuer.Subject.CommonName).Observe(latency.Seconds())
if err != nil {
cs.uploadCount.WithLabelValues(issuer.Subject.CommonName, "failed").Inc()
cs.log.AuditErrf("CRL upload failed: id=[%s] err=[%s]", crlId, err)
return fmt.Errorf("uploading to S3: %w", err)
}
cs.uploadCount.WithLabelValues(issuer.Subject.CommonName, "success").Inc()
cs.log.AuditInfof(
"CRL uploaded: id=[%s] issuerCN=[%s] thisUpdate=[%s] nextUpdate=[%s] numEntries=[%d]",
crlId, issuer.Subject.CommonName, crl.ThisUpdate, crl.NextUpdate, len(crl.RevokedCertificates),
)
return stream.SendAndClose(&emptypb.Empty{})
}