Skip to content

Commit f4b89c7

Browse files
authored
Merge pull request #1787 from domgoer/master
better wording
2 parents a4f45e8 + 457b7cd commit f4b89c7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

https/tls_config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func ConfigToTLSConfig(c *TLSStruct) (*tls.Config, error) {
167167
// Listen starts the server on the given address. If tlsConfigPath isn't empty the server connection will be started using TLS.
168168
func Listen(server *http.Server, tlsConfigPath string, logger log.Logger) error {
169169
if tlsConfigPath == "" {
170-
level.Info(logger).Log("msg", "TLS is disabled and it cannot be enabled on the fly.", "http2", false)
170+
level.Info(logger).Log("msg", "TLS is disabled.", "http2", false)
171171
return server.ListenAndServe()
172172
}
173173

@@ -197,10 +197,10 @@ func Listen(server *http.Server, tlsConfigPath string, logger log.Logger) error
197197
server.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler))
198198
}
199199
// Valid TLS config.
200-
level.Info(logger).Log("msg", "TLS is enabled and it cannot be disabled on the fly.", "http2", c.HTTPConfig.HTTP2)
200+
level.Info(logger).Log("msg", "TLS is enabled.", "http2", c.HTTPConfig.HTTP2)
201201
case errNoTLSConfig:
202202
// No TLS config, back to plain HTTP.
203-
level.Info(logger).Log("msg", "TLS is disabled and it cannot be enabled on the fly.", "http2", false)
203+
level.Info(logger).Log("msg", "TLS is disabled.", "http2", false)
204204
return server.ListenAndServe()
205205
default:
206206
// Invalid TLS config.

0 commit comments

Comments
 (0)