Return the error if count error

linkernetworks · Jun 28, 2018 · 0fbbfd9 · 0fbbfd9
1 parent f5e037f
commit 0fbbfd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/server/handler_network.go b/src/server/handler_network.go
@@ -111,7 +111,8 @@ func listNetworkHandler(ctx *web.Context) {
 
 	count, err := session.Count(entity.NetworkCollectionName, bson.M{})
 	if err != nil {
-		logger.Error(err)
+		response.InternalServerError(req.Request, resp.ResponseWriter, err)
+		return
 	}
 	totalPages := int(math.Ceil(float64(count) / float64(pageSize)))
 	resp.AddHeader("X-Total-Count", strconv.Itoa(count))

diff --git a/src/server/handler_storage_provider.go b/src/server/handler_storage_provider.go
@@ -88,7 +88,8 @@ func listStorageProvider(ctx *web.Context) {
 
 	count, err := session.Count(entity.StorageProviderCollectionName, bson.M{})
 	if err != nil {
-		logger.Error(err)
+		response.InternalServerError(req.Request, resp.ResponseWriter, err)
+		return
 	}
 	totalPages := int(math.Ceil(float64(count) / float64(pageSize)))
 	resp.AddHeader("X-Total-Count", strconv.Itoa(count))

diff --git a/src/server/handler_volume.go b/src/server/handler_volume.go
@@ -5,7 +5,6 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/linkernetworks/logger"
 	"github.com/linkernetworks/utils/timeutils"
 	"github.com/linkernetworks/vortex/src/entity"
 	response "github.com/linkernetworks/vortex/src/net/http"
@@ -124,7 +123,8 @@ func listVolume(ctx *web.Context) {
 
 	count, err := session.Count(entity.VolumeCollectionName, bson.M{})
 	if err != nil {
-		logger.Error(err)
+		response.InternalServerError(req.Request, resp.ResponseWriter, err)
+		return
 	}
 	totalPages := int(math.Ceil(float64(count) / float64(pageSize)))
 	resp.AddHeader("X-Total-Count", strconv.Itoa(count))