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

Merge pull request #110 from moio/proxy_store_improve_error_handling

Browse Source 
Proxy store improve error handling
This commit is contained in:
Ricardo Weir
2023-06-09 13:18:02 -07:00
committed by GitHub
parent 3cbeea22d3 7010a5e6c7
commit 4fd6f7e6be
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/stores/proxy/proxy_store.go
View File

@@ -311,7 +311,6 @@ func (s *Store) listAndWatch(apiOp *types.APIRequest, client dynamic.ResourceInt
rowToObject(obj)
result <- watch.Event{Type: watch.Modified, Object: obj}
} else {
logrus.Debugf("notifier watch error: %v", err)
returnErr(errors.Wrapf(err, "notifier watch error: %v", err), result)
}
}
@@ -323,7 +322,6 @@ func (s *Store) listAndWatch(apiOp *types.APIRequest, client dynamic.ResourceInt
for event := range watcher.ResultChan() {
if event.Type == watch.Error {
if status, ok := event.Object.(*metav1.Status); ok {
logrus.Debugf("event watch error: %s", status.Message)
returnErr(fmt.Errorf("event watch error: %s", status.Message), result)
} else {
logrus.Debugf("event watch error: could not decode event object %T", event.Object)
@@ -363,12 +361,22 @@ func (s *Store) WatchNames(apiOp *types.APIRequest, schema *types.APISchema, w t
go func() {
defer close(result)
for item := range c {
if item.Type == watch.Error {
if status, ok := item.Object.(*metav1.Status); ok {
logrus.Debugf("WatchNames received error: %s", status.Message)
} else {
logrus.Debugf("WatchNames received error: %v", item)
}
continue
}
m, err := meta.Accessor(item.Object)
if err != nil {
return
logrus.Debugf("WatchNames cannot process unexpected object: %s", err)
continue
}
if item.Type != watch.Error && names.Has(m.GetName()) {
if names.Has(m.GetName()) {
result <- item
}
}