Skip to content

Commit 05f34cd

Browse files
committed
fix review
1 parent 99c1868 commit 05f34cd

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

pkg/triple/dubbo3_client.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"context"
2222
"crypto/tls"
2323
"crypto/x509"
24-
"fmt"
2524
"io/ioutil"
2625
"reflect"
2726
"sync"
@@ -93,9 +92,8 @@ func NewTripleClient(impl interface{}, opt *config.Option) (*TripleClient, error
9392
}
9493

9594
if creds, err := getClientTlsCertificate(opt); err != nil {
96-
if err != nil {
97-
fmt.Printf("TripleClient.Start: TLS config err: %v", err)
98-
}
95+
opt.Logger.Errorf("TripleClient.Start: TLS config err: %v", err)
96+
return nil, err
9997
} else if creds != nil {
10098
dialOpts = append(dialOpts, grpc.WithTransportCredentials(creds))
10199
}
@@ -208,7 +206,7 @@ func (t *TripleClient) IsAvailable() bool {
208206
}
209207

210208
func getClientTlsCertificate(opt *config.Option) (credentials.TransportCredentials, error) {
211-
//no TLS
209+
// no TLS
212210
if opt.TLSCertFile == "" && opt.TLSKeyFile == "" {
213211
return nil, nil
214212
}
@@ -217,7 +215,7 @@ func getClientTlsCertificate(opt *config.Option) (credentials.TransportCredentia
217215
return credentials.NewClientTLSFromFile(opt.TLSCertFile, opt.TLSServerName)
218216
}
219217

220-
//need mTLS
218+
// need mTLS
221219
ca := x509.NewCertPool()
222220
caBytes, err := ioutil.ReadFile(opt.CACertFile)
223221
if err != nil {

pkg/triple/dubbo3_server.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ func newGrpcServerWithCodec(opt *config.Option) *grpc.Server {
220220
if opt.ProxyModeEnable {
221221
serverOpts = append(serverOpts, grpc.ProxyModeEnable(true))
222222
}
223-
//TLS config
223+
// TLS config
224224
if creds, err := getServerTlsCertificate(opt); err != nil {
225225
if err != nil {
226-
fmt.Printf("TripleServer.Start: TLS config err: %v", err)
226+
opt.Logger.Errorf("TripleClient.Start: TLS config err: %v", err)
227227
}
228228
} else if creds != nil {
229229
serverOpts = append(serverOpts, grpc.Creds(creds))
@@ -304,13 +304,13 @@ func (t *TripleServer) RefreshService() {
304304
}
305305

306306
func getServerTlsCertificate(opt *config.Option) (credentials.TransportCredentials, error) {
307-
//no TLS
307+
// no TLS
308308
if opt.TLSCertFile == "" && opt.TLSKeyFile == "" {
309309
return nil, nil
310310
}
311311
var ca *x509.CertPool
312312
cfg := &tls.Config{}
313-
//need mTLS
313+
// need mTLS
314314
if opt.CACertFile != "" {
315315
ca = x509.NewCertPool()
316316
caBytes, err := ioutil.ReadFile(opt.CACertFile)

0 commit comments

Comments
 (0)