add return when response bad request

linkernetworks · Jul 5, 2018 · abb0a8f · abb0a8f
1 parent faa0480
commit abb0a8f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/server/handler_node_metrics.go b/src/server/handler_node_metrics.go
@@ -18,6 +18,7 @@ func listNodeMetricsHandler(ctx *web.Context) {
 	results, err := queryFromPrometheus(sp, `{__name__=~"kube_node_info|kube_node_labels"}`)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	for _, result := range results {
@@ -44,6 +45,7 @@ func listNodeMetricsHandler(ctx *web.Context) {
 	results, err = queryFromPrometheus(sp, `{__name__=~"kube_node_status_condition",status="true"}==1`)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	for _, result := range results {
@@ -56,6 +58,7 @@ func listNodeMetricsHandler(ctx *web.Context) {
 	results, err = queryFromPrometheus(sp, `sum by(__name__, resource,node) ({__name__=~"kube_pod_container_resource_limits|kube_pod_container_resource_requests"})`)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	for _, result := range results {
@@ -94,6 +97,7 @@ func getNodeMetricsHandler(ctx *web.Context) {
 	results, err := queryFromPrometheus(sp, `{__name__=~"kube_node_info|kube_node_created|node_network_interface|kube_node_labels|kube_node_status_capacity|kube_node_status_allocatable",node=~"`+id+`"}`)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	for _, result := range results {
@@ -146,6 +150,7 @@ func getNodeMetricsHandler(ctx *web.Context) {
 	results, err = queryFromPrometheus(sp, `	{__name__=~"kube_node_status_condition",node=~"`+id+`",status="true"}==1`)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	node.Detail.Status = string(results[0].Metric["condition"])
@@ -154,6 +159,7 @@ func getNodeMetricsHandler(ctx *web.Context) {
 	results, err = queryFromPrometheus(sp, `sum by(__name__, resource) ({__name__=~"kube_pod_container_resource_limits|kube_pod_container_resource_requests",node=~"`+id+`"})`)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	for _, result := range results {
@@ -179,6 +185,7 @@ func getNodeMetricsHandler(ctx *web.Context) {
 	results, err = queryFromPrometheus(sp, `{__name__=~"node_network_interface|node_network_receive_bytes_total|node_network_transmit_bytes_total|node_network_receive_packets_total|node_network_transmit_packets_total",node=~"`+id+`"}`)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	for _, result := range results {

diff --git a/src/server/handler_prometheus.go b/src/server/handler_prometheus.go
@@ -24,11 +24,13 @@ func queryMetrics(ctx *web.Context) {
 		expression = q
 	} else {
 		response.BadRequest(req.Request, resp.ResponseWriter, fmt.Errorf("wrong expression: %v", q))
+		return
 	}
 
 	result, err := queryFromPrometheus(sp, expression)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
+		return
 	}
 
 	resp.WriteJson(map[string]interface{}{