未验证 提交 f8bf9841 编写于 作者: H huanggze

monitor: no need to produce error when devops is disabled

Signed-off-by: Nhuanggze <loganhuang@yunify.com>
上级 90961a24
......@@ -679,7 +679,9 @@ func GetClusterStatistics() *Response {
go func() {
num, err := workspaces.GetAllDevOpsProjectsNums()
if err != nil {
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 {
if _, notEnabled := err.(cs.ClientSetNotEnabledError); !notEnabled {
klog.Errorln(err)
}
devopsStats.Status = "error"
} else {
devopsStats.withMetricResult(now, num)
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册