return emtoy consumer slice from stor instead

CloudKarafka · Feb 1, 2021 · 8584c02 · 8584c02
1 parent 70adc78
commit 8584c02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/server/api/consumers.go b/server/api/consumers.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"sort"
 
-	"github.com/cloudkarafka/cloudkarafka-manager/config"
 	mw "github.com/cloudkarafka/cloudkarafka-manager/server/middleware"
 	"github.com/cloudkarafka/cloudkarafka-manager/store"
 	"goji.io/pat"
@@ -16,10 +15,6 @@ func ListConsumerGroups(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Unauthorized", http.StatusUnauthorized)
 		return
 	}
-	if config.NoConsumers {
-		writeAsJson(w, Page(1, 1, store.ConsumerSlice{}))
-		return
-	}
 	ps, p, err := pageInfo(r)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)

diff --git a/store/storage.go b/store/storage.go
@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cloudkarafka/cloudkarafka-manager/config"
 	humanize "github.com/dustin/go-humanize"
 )
 
@@ -174,6 +175,9 @@ func (me storage) SumBrokerSeries(metric string) TimeSerie {
 }
 
 func (me storage) Consumers() ConsumerSlice {
+	if config.NoConsumers {
+		return ConsumerSlice{}
+	}
 	me.RLock()
 	defer me.RUnlock()
 	var (