Commit b8489351 authored by Akshay Bharambe's avatar Akshay Bharambe
Browse files

Merge branch 'devbranch' into fdb_feature_special_bucket

parents 31a18b12 76156605
2 merge requests!11331 Aug MEP Merge Dev to Stg,!107Add: Pack bucket and lazy writing indexes
Showing with 3 additions and 2 deletions
...@@ -2,6 +2,7 @@ package mysql ...@@ -2,6 +2,7 @@ package mysql
import ( import (
"database/sql" "database/sql"
"database/sql/driver"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
...@@ -229,7 +230,7 @@ func (md *MySQLDAO) ExecQuery(query string, args ...interface{}) (string, error) ...@@ -229,7 +230,7 @@ func (md *MySQLDAO) ExecQuery(query string, args ...interface{}) (string, error)
return "", errormdl.CheckErr(connectionError) return "", errormdl.CheckErr(connectionError)
} }
pingError := connection.Ping() pingError := connection.Ping()
if errormdl.CheckErr(pingError) != nil { if errormdl.CheckErr(pingError) != nil && pingError != driver.ErrBadConn {
loggermdl.LogError(pingError) loggermdl.LogError(pingError)
return "", errormdl.CheckErr(pingError) return "", errormdl.CheckErr(pingError)
} }
...@@ -262,7 +263,7 @@ func (md *MySQLDAO) SelectQuery(query string, args ...interface{}) (*gjson.Resul ...@@ -262,7 +263,7 @@ func (md *MySQLDAO) SelectQuery(query string, args ...interface{}) (*gjson.Resul
// loggermdl.LogSpot(connection) // loggermdl.LogSpot(connection)
pingError := connection.Ping() pingError := connection.Ping()
if errormdl.CheckErr(pingError) != nil { if errormdl.CheckErr(pingError) != nil && pingError != driver.ErrBadConn {
loggermdl.LogError(pingError) loggermdl.LogError(pingError)
return nil, errormdl.CheckErr(pingError) return nil, errormdl.CheckErr(pingError)
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment