From 9b341ed3bc3f7637b35da3dc6a81cf5492a88e99 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Thu, 29 Mar 2018 03:47:40 +0800 Subject: [PATCH] Fix broken build (#4212) 90e3ad2 broke the build. This fixes the syntax and ensures compilation. I have no idea and make no claims that this is the correct behavior. --- physical/mysql/mysql.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/physical/mysql/mysql.go b/physical/mysql/mysql.go index cc7a80abc7..1bdfcb2b38 100644 --- a/physical/mysql/mysql.go +++ b/physical/mysql/mysql.go @@ -71,10 +71,10 @@ func NewMySQLBackend(conf map[string]string, logger log.Logger) (physical.Backen } dbTable := database + "." + table - maxIdleConnStr, ok := conf["max_idle_connections"] - var maxIdleConnInt int = nil + maxIdleConnStr, ok := conf["max_idle_connections"] + var maxIdleConnInt int if ok { - maxParmaxIdleConnInt, err = strconv.Atoi(maxIdleConnStr) + maxIdleConnInt, err = strconv.Atoi(maxIdleConnStr) if err != nil { return nil, errwrap.Wrapf("failed parsing max_idle_connections parameter: {{err}}", err) } @@ -83,8 +83,8 @@ func NewMySQLBackend(conf map[string]string, logger log.Logger) (physical.Backen } } - maxConnLifeStr, ok := conf["max_connection_lifetime"] - var maxConnLifeInt int = nil + maxConnLifeStr, ok := conf["max_connection_lifetime"] + var maxConnLifeInt int if ok { maxConnLifeInt, err = strconv.Atoi(maxConnLifeStr) if err != nil { @@ -126,11 +126,11 @@ func NewMySQLBackend(conf map[string]string, logger log.Logger) (physical.Backen return nil, fmt.Errorf("failed to connect to mysql: %v", err) } db.SetMaxOpenConns(maxParInt) - if maxIdleConnInt != nil { + if maxIdleConnInt != 0 { db.SetMaxIdleConns(maxIdleConnInt) } - if maxConnLifeInt != nil { - db.SetConnMaxLifetime(time.Second * maxConnLifeInt) + if maxConnLifeInt != 0 { + db.SetConnMaxLifetime(time.Duration(maxConnLifeInt) * time.Second) } // Check schema exists var schemaExist bool