From ef5e42cf0bfa3d9b5ce1ed9411410a4ec00006a8 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Wed, 21 Feb 2024 19:08:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20(#3942)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/utils/mysql/client.go | 2 ++ backend/utils/mysql/client/info.go | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/utils/mysql/client.go b/backend/utils/mysql/client.go index 14225adf9..b6f39d945 100644 --- a/backend/utils/mysql/client.go +++ b/backend/utils/mysql/client.go @@ -9,6 +9,7 @@ import ( "github.com/1Panel-dev/1Panel/backend/buserr" "github.com/1Panel-dev/1Panel/backend/constant" + "github.com/1Panel-dev/1Panel/backend/global" "github.com/1Panel-dev/1Panel/backend/utils/mysql/client" ) @@ -50,6 +51,7 @@ func NewMysqlClient(conn client.DBInfo) (MysqlClient, error) { ctx, cancel := context.WithTimeout(context.Background(), time.Duration(conn.Timeout)*time.Second) defer cancel() if err := db.PingContext(ctx); err != nil { + global.LOG.Errorf("test mysql conn failed, err: %v", err) return nil, err } if ctx.Err() == context.DeadlineExceeded { diff --git a/backend/utils/mysql/client/info.go b/backend/utils/mysql/client/info.go index b488d0cf4..9f2ffb6b1 100644 --- a/backend/utils/mysql/client/info.go +++ b/backend/utils/mysql/client/info.go @@ -135,7 +135,6 @@ func ConnWithSSL(ssl, skipVerify bool, clientKey, clientCert, rootCert string) ( return "", errors.New("unable to append root cert to pool") } tlsConfig.RootCAs = pool - tlsConfig.VerifyPeerCertificate = VerifyPeerCertFunc(pool) } if len(clientCert) != 0 && len(clientKey) != 0 { cert, err := tls.X509KeyPair([]byte(clientCert), []byte(clientKey))