TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-11 22:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
刘祥超
2022-03-11 17:39:08 +08:00
parent 6cb5529c3f
commit da67e726a2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/tasks/ssl_cert_update_ocsp_task.go
View File

@@ -72,7 +72,8 @@ func (this *SSLCertUpdateOCSPTask) Loop() error {
var errString = "" var errString = ""
if err != nil { if err != nil {
errString = err.Error() errString = err.Error()
remotelogs.Error("SSLCertUpdateOCSPTask", "update ocsp failed: "+errString)
remotelogs.Warn("SSLCertUpdateOCSPTask", "update ocsp failed: "+errString)
} }
err = models.SharedSSLCertDAO.UpdateCertOSCP(tx, int64(cert.Id), ocspData, errString) err = models.SharedSSLCertDAO.UpdateCertOSCP(tx, int64(cert.Id), ocspData, errString)
if err != nil { if err != nil {
@@ -127,7 +128,7 @@ func (this *SSLCertUpdateOCSPTask) UpdateCertOCSP(certOne *models.SSLCert) (ocsp
issuerReq.Header.Set("User-Agent", teaconst.ProductName+"/"+teaconst.Version) issuerReq.Header.Set("User-Agent", teaconst.ProductName+"/"+teaconst.Version)
issuerResp, err := httpClient.Do(issuerReq) issuerResp, err := httpClient.Do(issuerReq)
if err != nil { if err != nil {
return nil, errors.New("request issuer certificate failed: " + err.Error()) return nil, errors.New("request issuer certificate failed: '" + issuerURL + "': " + err.Error())
} }
defer func() { defer func() {
_ = issuerResp.Body.Close() _ = issuerResp.Body.Close()
@@ -135,11 +136,11 @@ func (this *SSLCertUpdateOCSPTask) UpdateCertOCSP(certOne *models.SSLCert) (ocsp
issuerData, err := ioutil.ReadAll(issuerResp.Body) issuerData, err := ioutil.ReadAll(issuerResp.Body)
if err != nil { if err != nil {
return nil, errors.New("read issuer certificate failed: " + err.Error()) return nil, errors.New("read issuer certificate failed: '" + issuerURL + "': " + err.Error())
} }
issuerCert, err := x509.ParseCertificate(issuerData) issuerCert, err := x509.ParseCertificate(issuerData)
if err != nil { if err != nil {
return nil, errors.New("parse issuer certificate failed: " + err.Error()) return nil, errors.New("parse issuer certificate failed: '" + issuerURL + "': " + err.Error())
} }
buf, err := ocsp.CreateRequest(cert, issuerCert, &ocsp.RequestOptions{ buf, err := ocsp.CreateRequest(cert, issuerCert, &ocsp.RequestOptions{
@@ -157,7 +158,7 @@ func (this *SSLCertUpdateOCSPTask) UpdateCertOCSP(certOne *models.SSLCert) (ocsp
ocspResp, err := httpClient.Do(ocspReq) ocspResp, err := httpClient.Do(ocspReq)
if err != nil { if err != nil {
return nil, errors.New("request ocsp failed: " + err.Error()) return nil, errors.New("request ocsp failed: '" + ocspServerURL + "': " + err.Error())
} }
defer func() { defer func() {
@@ -166,7 +167,7 @@ func (this *SSLCertUpdateOCSPTask) UpdateCertOCSP(certOne *models.SSLCert) (ocsp
respData, err := ioutil.ReadAll(ocspResp.Body) respData, err := ioutil.ReadAll(ocspResp.Body)
if err != nil { if err != nil {
return nil, errors.New("read ocsp failed: " + err.Error()) return nil, errors.New("read ocsp failed: '" + ocspServerURL + "': " + err.Error())
} }
ocspResult, err := ocsp.ParseResponse(respData, issuerCert) ocspResult, err := ocsp.ParseResponse(respData, issuerCert)