From 36dbc5f51cc8259570725a15a0645aafbaf689e7 Mon Sep 17 00:00:00 2001 From: Yuan Liu Date: Wed, 17 Oct 2018 17:45:06 +0800 Subject: [PATCH 1/2] Add socket support for mysql data source --- pkg/tsdb/mysql/mysql.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go index 645f6b49bbb..110558a3bcf 100644 --- a/pkg/tsdb/mysql/mysql.go +++ b/pkg/tsdb/mysql/mysql.go @@ -5,6 +5,7 @@ import ( "fmt" "reflect" "strconv" + "strings" "github.com/go-sql-driver/mysql" "github.com/go-xorm/core" @@ -20,10 +21,16 @@ func init() { func newMysqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoint, error) { logger := log.New("tsdb.mysql") + var protocol string + if strings.HasPrefix(datasource.Url, "/") { + protocol = "unix" + } else { + protocol = "tcp" + } cnnstr := fmt.Sprintf("%s:%s@%s(%s)/%s?collation=utf8mb4_unicode_ci&parseTime=true&loc=UTC&allowNativePasswords=true", datasource.User, datasource.Password, - "tcp", + protocol, datasource.Url, datasource.Database, ) From f640df7a2c76f10134bbf609eb9a139f5c93b0c3 Mon Sep 17 00:00:00 2001 From: Yuan Liu Date: Thu, 18 Oct 2018 01:45:14 +0800 Subject: [PATCH 2/2] simplify code --- pkg/tsdb/mysql/mysql.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go index 110558a3bcf..35b03e489a0 100644 --- a/pkg/tsdb/mysql/mysql.go +++ b/pkg/tsdb/mysql/mysql.go @@ -21,11 +21,9 @@ func init() { func newMysqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoint, error) { logger := log.New("tsdb.mysql") - var protocol string + protocol := "tcp" if strings.HasPrefix(datasource.Url, "/") { protocol = "unix" - } else { - protocol = "tcp" } cnnstr := fmt.Sprintf("%s:%s@%s(%s)/%s?collation=utf8mb4_unicode_ci&parseTime=true&loc=UTC&allowNativePasswords=true", datasource.User,