Skip to content

Commit 63fa74e

Browse files
authored
Merge pull request #10 from gravitational/teleport-v1.9.1-fix-default-server
only make NewDefaultServer once when neccessary
2 parents c030e48 + 53560b7 commit 63fa74e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

server/conn.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ func NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, err
4747
p.AddUser(user, password)
4848

4949
var packetConn *packet.Conn
50-
if defaultServer.tlsConfig != nil {
50+
if defaultServer().tlsConfig != nil {
5151
packetConn = packet.NewTLSConn(conn)
5252
} else {
5353
packetConn = packet.NewConn(conn)
5454
}
5555

5656
c := &Conn{
5757
Conn: packetConn,
58-
serverConf: defaultServer,
58+
serverConf: defaultServer(),
5959
credentialProvider: p,
6060
h: h,
6161
connectionID: atomic.AddUint32(&baseConnID, 1),

server/server_conf.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
. "github.com/go-mysql-org/go-mysql/mysql"
99
)
1010

11-
var defaultServer = NewDefaultServer()
11+
var defaultServer = sync.OnceValue(NewDefaultServer)
1212

1313
// Defines a basic MySQL server with configs.
1414
//

0 commit comments

Comments
 (0)