Skip to content

Commit 714a3cd

Browse files
authored
make logger on TLSConfig global (#336)
* make logger on TLSConfig global * fix test conditions
1 parent a9550f1 commit 714a3cd

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

transport/tlscommon/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func LoadTLSConfig(config *Config, logger *logp.Logger) (*TLSConfig, error) {
8888
Renegotiation: tls.RenegotiationSupport(config.Renegotiation),
8989
CASha256: config.CASha256,
9090
CATrustedFingerprint: config.CATrustedFingerprint,
91-
logger: logger,
91+
Logger: logger,
9292
}, nil
9393
}
9494

transport/tlscommon/server_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func LoadTLSServerConfig(config *ServerConfig, logger *logp.Logger) (*TLSConfig,
9696
CurvePreferences: curves,
9797
ClientAuth: tls.ClientAuthType(clientAuth),
9898
CASha256: config.CASha256,
99-
logger: logger,
99+
Logger: logger,
100100
}, nil
101101
}
102102

transport/tlscommon/tls_config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ type TLSConfig struct {
8787
// If time is nil, TLS uses time.Now.
8888
time func() time.Time
8989

90-
logger *logp.Logger
90+
Logger *logp.Logger
9191
}
9292

9393
var (
@@ -106,7 +106,7 @@ func (c *TLSConfig) ToConfig() *tls.Config {
106106

107107
insecure := c.Verification != VerifyStrict
108108
if c.Verification == VerifyNone {
109-
c.logger.Named("tls").Warn("SSL/TLS verifications disabled.")
109+
c.Logger.Named("tls").Warn("SSL/TLS verifications disabled.")
110110
}
111111

112112
return &tls.Config{
@@ -121,7 +121,7 @@ func (c *TLSConfig) ToConfig() *tls.Config {
121121
Renegotiation: c.Renegotiation,
122122
ClientAuth: c.ClientAuth,
123123
Time: c.time,
124-
VerifyConnection: makeVerifyConnection(c, c.logger),
124+
VerifyConnection: makeVerifyConnection(c, c.Logger),
125125
}
126126
}
127127

transport/tlscommon/tls_config_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ func TestVerificationMode(t *testing.T) {
651651
Verification: test.verificationMode,
652652
RootCAs: certPool,
653653
ServerName: test.hostname,
654-
logger: logptest.NewTestingLogger(t, ""),
654+
Logger: logptest.NewTestingLogger(t, ""),
655655
}
656656

657657
if test.ignoreCerts {
@@ -674,6 +674,8 @@ func TestVerificationMode(t *testing.T) {
674674
if err != nil {
675675
// We got the expected error, no need to check the status code
676676
return
677+
} else {
678+
t.Fatalf("expected error, got: %v", err)
677679
}
678680
}
679681

0 commit comments

Comments
 (0)