github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-06-21 12:17:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix counts

Browse Source
This commit is contained in:
Darren Shepherd 2020-03-14 11:46:20 -07:00
parent fe57a07726
commit eda3ecf987
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/clustercache/controller.go
View File

@ -228,7 +228,7 @@ func (h *clusterCache) start() {
key := toKey(event.obj) key := toKey(event.obj)
if event.oldObj != nil { if event.oldObj != nil {
_, err := callAll(h.addHandlers.List(), event.gvr, key, event.obj, event.oldObj) _, err := callAll(h.changeHandlers.List(), event.gvr, key, event.obj, event.oldObj)
if err != nil { if err != nil {
logrus.Errorf("failed to handle add event: %v", err) logrus.Errorf("failed to handle add event: %v", err)
} }

5
pkg/server/resources/counts/counts.go
View File

@ -145,6 +145,7 @@ func (s *Store) Watch(apiOp *types.APIRequest, schema *types.APISchema, w types.
return nil return nil
} }
itemCount = removeCounts(itemCount, namespace, oldSummary) itemCount = removeCounts(itemCount, namespace, oldSummary)
itemCount = addCounts(itemCount, namespace, summary)
} else { } else {
return nil return nil
} }
@ -242,7 +243,7 @@ func getInfo(obj interface{}) (name string, namespace string, revision int, summ
func removeCounts(itemCount ItemCount, ns string, summary summary.Summary) ItemCount { func removeCounts(itemCount ItemCount, ns string, summary summary.Summary) ItemCount {
itemCount.Summary = removeSummary(itemCount.Summary, summary) itemCount.Summary = removeSummary(itemCount.Summary, summary)
if ns == "" { if ns != "" {
itemCount.Namespaces[ns] = removeSummary(itemCount.Namespaces[ns], summary) itemCount.Namespaces[ns] = removeSummary(itemCount.Namespaces[ns], summary)
} }
return itemCount return itemCount
@ -250,7 +251,7 @@ func removeCounts(itemCount ItemCount, ns string, summary summary.Summary) ItemC
func addCounts(itemCount ItemCount, ns string, summary summary.Summary) ItemCount { func addCounts(itemCount ItemCount, ns string, summary summary.Summary) ItemCount {
itemCount.Summary = addSummary(itemCount.Summary, summary) itemCount.Summary = addSummary(itemCount.Summary, summary)
if ns == "" { if ns != "" {
itemCount.Namespaces[ns] = addSummary(itemCount.Namespaces[ns], summary) itemCount.Namespaces[ns] = addSummary(itemCount.Namespaces[ns], summary)
} }
return itemCount return itemCount