admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrap error messages

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-07-04 20:28:58 +08:00
committed by zryfish
parent d16aee1176
commit 78f9e1b74d
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apiserver/tenant/tenant.go
View File

@@ -335,7 +335,7 @@ func LogQuery(req *restful.Request, resp *restful.Response) {
clusterRules, err := iam.GetUserClusterRules(username)
if err != nil {
resp.WriteError(http.StatusInternalServerError, err)
resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
glog.Errorln(err)
return
}
@@ -348,8 +348,9 @@ func LogQuery(req *restful.Request, resp *restful.Response) {
namespaces := make([]string, 0)
roles, err := iam.GetUserRoles("", username)
if err != nil {
resp.WriteError(http.StatusInternalServerError, err)
resp.WriteHeaderAndEntity(http.StatusInternalServerError, errors.Wrap(err))
glog.Errorln(err)
return
}
for _, role := range roles {
if !sliceutil.HasString(namespaces, role.Namespace) && iam.RulesMatchesRequired(role.Rules, rbacv1.PolicyRule{Verbs: []string{"get"}, Resources: []string{"*"}, APIGroups: []string{"logging.kubesphere.io"}}) {