modify error report format

linkernetworks · Jul 5, 2018 · f7c6748 · f7c6748
1 parent d79c18b
commit f7c6748
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/server/handler_node_metrics.go b/src/server/handler_node_metrics.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/linkernetworks/vortex/src/entity"
@@ -19,7 +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, fmt.Errorf("%v", err))
+		response.BadRequest(req.Request, resp.ResponseWriter, err)
 	}
 
 	for _, result := range results {
@@ -46,7 +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, fmt.Errorf("%v", err))
+		response.BadRequest(req.Request, resp.ResponseWriter, err)
 	}
 
 	for _, result := range results {
@@ -59,7 +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, fmt.Errorf("%v", err))
+		response.BadRequest(req.Request, resp.ResponseWriter, err)
 	}
 
 	for _, result := range results {
@@ -98,7 +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, fmt.Errorf("%v", err))
+		response.BadRequest(req.Request, resp.ResponseWriter, err)
 	}
 
 	for _, result := range results {
@@ -151,7 +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, fmt.Errorf("%v", err))
+		response.BadRequest(req.Request, resp.ResponseWriter, err)
 	}
 
 	node.Detail.Status = string(results[0].Metric["condition"])
@@ -160,7 +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, fmt.Errorf("%v", err))
+		response.BadRequest(req.Request, resp.ResponseWriter, err)
 	}
 
 	for _, result := range results {
@@ -186,7 +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, fmt.Errorf("%v", err))
+		response.BadRequest(req.Request, resp.ResponseWriter, err)
 	}
 
 	for _, result := range results {