opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3550 from swordqiu/hotfix/qj-simplify-delete-fail-reason

Browse Source 
fix: simplify object delete-fail-reason message
This commit is contained in:
yunion-ci-robot
2019-11-11 09:59:17 +08:00
committed by GitHub
parent 4faea3ffc5 d27f718e3e
commit ab1e3eb4fb
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+2 -2
View File
@@ -670,14 +670,14 @@ func getModelExtraDetails(item IModel, ctx context.Context, extra *jsonutils.JSO
err := item.ValidateDeleteCondition(ctx)
if err != nil {
extra.Add(jsonutils.JSONFalse, "can_delete")
extra.Add(jsonutils.NewString(err.Error()), "delete_fail_reason")
extra.Add(jsonutils.NewString(httputils.ErrorMsg(err)), "delete_fail_reason")
} else {
extra.Add(jsonutils.JSONTrue, "can_delete")
}
err = item.ValidateUpdateCondition(ctx)
if err != nil {
extra.Add(jsonutils.JSONFalse, "can_update")
extra.Add(jsonutils.NewString(err.Error()), "update_fail_reason")
extra.Add(jsonutils.NewString(httputils.ErrorMsg(err)), "update_fail_reason")
} else {
extra.Add(jsonutils.JSONTrue, "can_update")
}
pkg/compute/models/hosts.go
+1 -1
View File
@@ -2338,7 +2338,7 @@ func (self *SHost) getMoreDetails(ctx context.Context, extra *jsonutils.JSONDict
extra.Add(jsonutils.JSONTrue, "can_prepare")
} else {
extra.Add(jsonutils.JSONFalse, "can_prepare")
extra.Add(jsonutils.NewString(err.Error()), "prepare_fail_reason")
extra.Add(jsonutils.NewString(httputils.ErrorMsg(err)), "prepare_fail_reason")
}
}
pkg/util/httputils/httputils.go
+11
View File
@@ -92,6 +92,17 @@ func ErrorCode(err error) int {
return -1
}
func ErrorMsg(err error) string {
if err == nil {
return ""
}
switch je := err.(type) {
case *JSONClientError:
return je.Details
}
return err.Error()
}
func GetAddrPort(urlStr string) (string, int, error) {
parts, err := url.Parse(urlStr)
if err != nil {