a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Debugging Travis.

This commit is contained in:
Azareal 2018-08-29 12:22:09 +10:00
parent 11303d85c3
commit b1c74e9069
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
query_gen/lib/mysql.go
View File

@ -41,6 +41,13 @@ func (adapter *MysqlAdapter) GetStmts() map[string]DBStmt {
// TODO: Add an option to disable unix pipes // TODO: Add an option to disable unix pipes
func (adapter *MysqlAdapter) BuildConn(config map[string]string) (*sql.DB, error) { func (adapter *MysqlAdapter) BuildConn(config map[string]string) (*sql.DB, error) {
// The adapter seems to be panicking when encountering a recoverable error x.x
defer func() {
if r := recover(); r != nil {
fmt.Println("Recovered in f", r)
}
}()
dbCollation, ok := config["collation"] dbCollation, ok := config["collation"]
if !ok { if !ok {
return nil, ErrNoCollation return nil, ErrNoCollation
@ -52,13 +59,6 @@ func (adapter *MysqlAdapter) BuildConn(config map[string]string) (*sql.DB, error
// First try opening a pipe as those are faster // First try opening a pipe as those are faster
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
// The adapter seems to be panicking when encountering a recoverable error x.x
defer func() {
if r := recover(); r != nil {
fmt.Println("Recovered in f", r)
}
}()
var dbsocket = "/tmp/mysql.sock" var dbsocket = "/tmp/mysql.sock"
if config["socket"] != "" { if config["socket"] != "" {
dbsocket = config["socket"] dbsocket = config["socket"]
@ -68,6 +68,8 @@ func (adapter *MysqlAdapter) BuildConn(config map[string]string) (*sql.DB, error
if err == nil { if err == nil {
// Make sure that the connection is alive // Make sure that the connection is alive
return db, db.Ping() return db, db.Ping()
} else {
fmt.Println(err)
} }
} }