Prevent infinite pagination loop

sensu · Apr 14, 2016 · a6950ce · a6950ce
1 parent 798c48c
commit a6950ce
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/uchiwa/sensu/methods.go b/uchiwa/sensu/methods.go
@@ -48,7 +48,6 @@ func (api *API) getSlice(endpoint string, limit int) ([]interface{}, error) {
 	if err != nil {
 		return nil, fmt.Errorf("Could not parse the JSON-encoded response body: %v", err)
 	}
-
 	// Verify if the endpoint supports pagination
 	if limit != -1 && res.Header.Get("X-Pagination") != "" {
 		var xPagination structs.XPagination
@@ -74,6 +73,11 @@ func (api *API) getSlice(endpoint string, limit int) ([]interface{}, error) {
 				return nil, fmt.Errorf("Could not parse the JSON-encoded response body: %v", err)
 			}
 
+			if len(partialList) == 0 {
+				logger.Debugf("No additional elements found, exiting pagination for %s endpoint", endpoint)
+				break
+			}
+
 			for _, e := range partialList {
 				list = append(list, e)
 			}