From 53560b78081898c19b93172e1d08e3c9fe0f2463 Mon Sep 17 00:00:00 2001 From: "STeve (Xin) Huang" Date: Tue, 1 Apr 2025 08:01:47 -0700 Subject: [PATCH] only make NewDefaultServer once when neccessary --- server/conn.go | 4 ++-- server/server_conf.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/conn.go b/server/conn.go index 03521ecb2..c1f1fa6d0 100644 --- a/server/conn.go +++ b/server/conn.go @@ -47,7 +47,7 @@ func NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, err p.AddUser(user, password) var packetConn *packet.Conn - if defaultServer.tlsConfig != nil { + if defaultServer().tlsConfig != nil { packetConn = packet.NewTLSConn(conn) } else { packetConn = packet.NewConn(conn) @@ -55,7 +55,7 @@ func NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, err c := &Conn{ Conn: packetConn, - serverConf: defaultServer, + serverConf: defaultServer(), credentialProvider: p, h: h, connectionID: atomic.AddUint32(&baseConnID, 1), diff --git a/server/server_conf.go b/server/server_conf.go index 0328bbe95..bea64c488 100644 --- a/server/server_conf.go +++ b/server/server_conf.go @@ -8,7 +8,7 @@ import ( . "github.com/go-mysql-org/go-mysql/mysql" ) -var defaultServer = NewDefaultServer() +var defaultServer = sync.OnceValue(NewDefaultServer) // Defines a basic MySQL server with configs. //