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

Merge pull request #1065 from huanggze/devops-disabled

Browse Source 
monitor: no need to produce error when devops is disabled
This commit is contained in:
KubeSphere CI Bot
2019-10-17 16:59:46 +08:00
committed by GitHub
parent 3dd3f8870d f8bf984191
commit 3b9e743211
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/models/metrics/metrics.go
View File

@@ -679,7 +679,9 @@ func GetClusterStatistics() *Response {
go func() {
num, err := workspaces.GetAllDevOpsProjectsNums()
if err != nil {
klog.Errorln(err)
if _, notEnabled := err.(cs.ClientSetNotEnabledError); !notEnabled {
klog.Errorln(err)
}
devopsStats.Status = "error"
} else {
devopsStats.withMetricResult(now, num)
@@ -746,7 +748,9 @@ func GetWorkspaceStatistics(workspaceName string) *Response {
go func() {
num, err := workspaces.GetDevOpsProjectsCount(workspaceName)
if err != nil {
klog.Errorln(err)
if _, notEnabled := err.(cs.ClientSetNotEnabledError); !notEnabled {
klog.Errorln(err)
}
devopsStats.Status = "error"
} else {
devopsStats.withMetricResult(now, num)

9
pkg/models/workspaces/workspaces.go
View File

@@ -169,6 +169,10 @@ func DeleteWorkspaceRoleBinding(workspace, username string, role string) error {
}
func GetDevOpsProjectsCount(workspaceName string) (int, error) {
_, err := clientset.ClientSets().Devops()
if _, notEnabled := err.(clientset.ClientSetNotEnabledError); notEnabled {
return 0, err
}
dbconn, err := clientset.ClientSets().MySQL()
if err != nil {
@@ -237,6 +241,11 @@ func GetAllProjectNums() (int, error) {
}
func GetAllDevOpsProjectsNums() (int, error) {
_, err := clientset.ClientSets().Devops()
if _, notEnabled := err.(clientset.ClientSetNotEnabledError); notEnabled {
return 0, err
}
dbconn, err := clientset.ClientSets().MySQL()
if err != nil {
return 0, err