Skip to content

Commit

Permalink
✅ add outputLog for mysql error
Browse files Browse the repository at this point in the history 
Signed-off-by: vankichi <kyukawa315@gmail.com>
  • Loading branch information
@vankichi
vankichi committed Feb 19, 2021
1 parent 2e13626 commit a84417f
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 37 deletions.
53 changes: 17 additions & 36 deletions internal/db/rdb/mysql/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,7 @@ func (m *mySQLClient) Open(ctx context.Context) (err error) {
func (m *mySQLClient) Ping(ctx context.Context) (err error) {
if m.session == nil {
err = errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return err
}
pctx, cancel := context.WithTimeout(ctx, m.initialPingTimeLimit)
Expand Down Expand Up @@ -186,10 +183,8 @@ func (m *mySQLClient) Ping(ctx context.Context) (err error) {
func (m *mySQLClient) Close(ctx context.Context) (err error) {
if m.session == nil {
err = errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
m.connected.Store(false)
return err
}

Expand All @@ -210,10 +205,7 @@ func (m *mySQLClient) GetVector(ctx context.Context, uuid string) (Vector, error

if m.session == nil {
err := errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return nil, err
}

Expand Down Expand Up @@ -246,10 +238,7 @@ func (m *mySQLClient) GetIPs(ctx context.Context, uuid string) ([]string, error)

if m.session == nil {
err := errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return nil, err
}

Expand Down Expand Up @@ -292,10 +281,7 @@ func (m *mySQLClient) SetVector(ctx context.Context, vec Vector) error {

if m.session == nil {
err := errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return err
}

Expand Down Expand Up @@ -352,10 +338,7 @@ func (m *mySQLClient) SetVectors(ctx context.Context, vecs ...Vector) error {

if m.session == nil {
err := errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return err
}

Expand Down Expand Up @@ -415,10 +398,7 @@ func (m *mySQLClient) deleteVector(ctx context.Context, val string) error {

if m.session == nil {
err := errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return err
}

Expand Down Expand Up @@ -477,10 +457,7 @@ func (m *mySQLClient) SetIPs(ctx context.Context, uuid string, ips ...string) er

if m.session == nil {
err := errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return err
}

Expand Down Expand Up @@ -519,10 +496,7 @@ func (m *mySQLClient) RemoveIPs(ctx context.Context, ips ...string) error {

if m.session == nil {
err := errors.ErrMySQLSessionNil
log.Errorf(
"err: %s, { db: %s, host: %s, port: %d, user: %s, name: %s, charset: %s } ",
err.Error(), m.db, m.host, m.port, m.user, m.name, m.charset,
)
m.outputLog(err)
return err
}

Expand All @@ -539,3 +513,10 @@ func (m *mySQLClient) RemoveIPs(ctx context.Context, ips ...string) error {

return tx.Commit()
}

func (m *mySQLClient) outputLog(err error) {
log.Errorf(
"err: %v, { host: %s, port: %d, user: %s, name: %s, db: %s, charset: %s, socketPath: %s, network: %s} ",
err, m.host, m.port, m.user, m.name, m.db, m.charset, m.socketPath, m.network,
)
}
7 changes: 6 additions & 1 deletion internal/db/rdb/mysql/mysql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ func Test_mySQLClient_Open(t *testing.T) {
fields: fields{
db: "vdaas",
host: "vald.com",
network: "tcp",
socketPath: "",
port: 3306,
user: "vdaas",
pass: "vald",
Expand Down Expand Up @@ -248,6 +250,8 @@ func Test_mySQLClient_Open(t *testing.T) {
db: "vdaas",
host: "vald.com",
port: 3306,
network: "tcp",
socketPath: "",
user: "vdaas",
pass: "vald",
name: "vald-user",
Expand Down Expand Up @@ -302,9 +306,10 @@ func Test_mySQLClient_Open(t *testing.T) {
},
fields: fields{
db: "vdaas",
network: "unixgram",
host: "vald.com",
port: 3306,
network: "unixgram",
socketPath: "/var/run/vald.sock",
user: "vdaas",
pass: "vald",
name: "vald-user",
Expand Down

0 comments on commit a84417f

Please sign in to comment.