blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-06-05 07:43:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source
This commit is contained in:
skiffer-git 2023-01-12 16:50:47 +08:00
commit f8372c2744
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/common/http/http_client.go
View File

@ -65,13 +65,13 @@ func CallBackPostReturn(url, callbackCommand string, input interface{}, output c
b, err := Post(url, input, timeOut) b, err := Post(url, input, timeOut)
if err != nil { if err != nil {
if failedContinue != nil && *failedContinue { if failedContinue != nil && *failedContinue {
return &constant.ErrCallbackContinue return constant.ErrCallbackContinue
} }
return constant.NewErrNetwork(err) return constant.NewErrNetwork(err)
} }
if err = json.Unmarshal(b, output); err != nil { if err = json.Unmarshal(b, output); err != nil {
if failedContinue != nil && *failedContinue { if failedContinue != nil && *failedContinue {
return &constant.ErrCallbackContinue return constant.ErrCallbackContinue
} }
return constant.NewErrData(err) return constant.NewErrData(err)
} }

2
pkg/getcdv3/temp.go
View File

@ -21,7 +21,7 @@ func GetConn(ctx context.Context, serviceName string) (conn *grpc.ClientConn, er
conn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), conn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","),
serviceName, trace_log.GetOperationID(ctx), config.Config.Etcd.UserName, config.Config.Etcd.Password) serviceName, trace_log.GetOperationID(ctx), config.Config.Etcd.UserName, config.Config.Etcd.Password)
if conn == nil { if conn == nil {
return nil, &constant.ErrInternalServer return nil, constant.ErrInternalServer
} }
return conn, nil return conn, nil
} }