IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-19 00:09:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	cmd/msggateway/main.go
#	go.sum
#	internal/msggateway/init.go
This commit is contained in:
Gordon
2023-03-08 18:42:25 +08:00
parent 52e03b0149 540c33ba74
commit 7f3ee77116
87 changed files with 2538 additions and 2232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/constant/constant.go
+5 -7
View File
@@ -310,17 +310,15 @@ func GroupIsBanPrivateChat(status int32) bool {
return true
}
const BigVersion = "v2"
const LogFileName = "OpenIM.log"
const CurrentVersion = "v2.3.4-rc0"
const LocalHost = "0.0.0.0"
// flag parse
const (
FlagPort = "port"
PrometheusPort = "prometheus_port"
FlagConf = "config_folder_path"
FlagPort = "port"
FlagWsPort = "ws_port"
FlagPrometheusPort = "prometheus_port"
FlagConf = "config_folder_path"
)
pkg/common/constant/error_info.go
-89
View File
@@ -1,89 +0,0 @@
package constant
import (
"github.com/pkg/errors"
"strings"
)
type ErrInfo struct {
ErrCode int32
ErrMsg string
DetailErrMsg string
}
func NewErrInfo(code int32, msg, detail string) *ErrInfo {
return &ErrInfo{
ErrCode: code,
ErrMsg: msg,
DetailErrMsg: detail,
}
}
func (e *ErrInfo) Error() string {
return "errMsg: " + e.ErrMsg + " detail errMsg: " + e.DetailErrMsg
}
func (e *ErrInfo) Code() int32 {
return e.ErrCode
}
func (e *ErrInfo) Msg() string {
return e.ErrMsg
}
func (e *ErrInfo) Detail() string {
return e.DetailErrMsg
}
func (e *ErrInfo) Wrap(msg ...string) error {
return errors.Wrap(e, strings.Join(msg, "--"))
}
func NewErrNetwork(err error) error {
return toDetail(err, ErrNetwork)
}
func NewErrData(err error) error {
return toDetail(err, ErrData)
}
func toDetail(err error, info *ErrInfo) *ErrInfo {
errInfo := *info
errInfo.DetailErrMsg = err.Error()
return &errInfo
}
func ToAPIErrWithErr(err error) *ErrInfo {
return &ErrInfo{}
//unwrap := utils.Unwrap(err)
//if unwrap == gorm.ErrRecordNotFound {
// return &ErrInfo{
// ErrCode: ErrRecordNotFound.Code(),
// ErrMsg: ErrRecordNotFound.Msg(),
// DetailErrMsg: fmt.Sprintf("%+v", err),
// }
//}
//if errInfo, ok := unwrap.(*ErrInfo); ok {
// return &ErrInfo{
// ErrCode: errInfo.Code(),
// ErrMsg: errInfo.Msg(),
// DetailErrMsg: fmt.Sprintf("%+v", err),
// }
//}
//
//errComm := errors.New("")
//var marshalErr *json.MarshalerError
//errInfo := &ErrInfo{}
//switch {
//case errors.As(err, &errComm):
// if errors.Is(err, gorm.ErrRecordNotFound) {
// return toDetail(err, ErrRecordNotFound)
// }
// return toDetail(err, ErrData)
//case errors.As(err, &marshalErr):
// return toDetail(err, ErrData)
//case errors.As(err, &errInfo):
// return toDetail(err, errInfo)
//}
//return toDetail(err, ErrDefaultOther)
}