Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
MKCLOS
Core Development Platform
corepkgv2
Commits
b8489351
Commit
b8489351
authored
5 years ago
by
Akshay Bharambe
Browse files
Options
Downloads
Plain Diff
Merge branch 'devbranch' into fdb_feature_special_bucket
parents
31a18b12
76156605
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!113
31 Aug MEP Merge Dev to Stg
,
!107
Add: Pack bucket and lazy writing indexes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dalmdl/mysql/mysql.go
+3
-2
dalmdl/mysql/mysql.go
with
3 additions
and
2 deletions
dalmdl/mysql/mysql.go
+
3
−
2
View file @
b8489351
...
...
@@ -2,6 +2,7 @@ package mysql
import
(
"database/sql"
"database/sql/driver"
"strconv"
"strings"
"sync"
...
...
@@ -229,7 +230,7 @@ func (md *MySQLDAO) ExecQuery(query string, args ...interface{}) (string, error)
return
""
,
errormdl
.
CheckErr
(
connectionError
)
}
pingError
:=
connection
.
Ping
()
if
errormdl
.
CheckErr
(
pingError
)
!=
nil
{
if
errormdl
.
CheckErr
(
pingError
)
!=
nil
&&
pingError
!=
driver
.
ErrBadConn
{
loggermdl
.
LogError
(
pingError
)
return
""
,
errormdl
.
CheckErr
(
pingError
)
}
...
...
@@ -262,7 +263,7 @@ func (md *MySQLDAO) SelectQuery(query string, args ...interface{}) (*gjson.Resul
// loggermdl.LogSpot(connection)
pingError
:=
connection
.
Ping
()
if
errormdl
.
CheckErr
(
pingError
)
!=
nil
{
if
errormdl
.
CheckErr
(
pingError
)
!=
nil
&&
pingError
!=
driver
.
ErrBadConn
{
loggermdl
.
LogError
(
pingError
)
return
nil
,
errormdl
.
CheckErr
(
pingError
)
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets