unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

grpc client/server fixes (#1355)

Browse Source 
* grpc client/server fixes

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2020-03-17 14:27:20 +03:00
committed by GitHub
parent 03031a694d
commit ab73127063
7 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
store/service/service.go
View File

@@ -62,7 +62,7 @@ func (s *serviceStore) Context() context.Context {
// Sync all the known records
func (s *serviceStore) List(opts ...store.ListOption) ([]string, error) {
stream, err := s.Client.List(s.Context(), &pb.ListRequest{}, client.WithAddress(s.Nodes...))
if verr, ok := err.(*errors.Error); ok && verr.Code == 404 {
if err != nil && errors.Equal(err, errors.NotFound("", "")) {
return nil, store.ErrNotFound
} else if err != nil {
return nil, err
@@ -101,7 +101,7 @@ func (s *serviceStore) Read(key string, opts ...store.ReadOption) ([]*store.Reco
Prefix: options.Prefix,
},
}, client.WithAddress(s.Nodes...))
if verr, ok := err.(*errors.Error); ok && verr.Code == 404 {
if err != nil && errors.Equal(err, errors.NotFound("", "")) {
return nil, store.ErrNotFound
} else if err != nil {
return nil, err
@@ -129,6 +129,9 @@ func (s *serviceStore) Write(record *store.Record, opts ...store.WriteOption) er
Expiry: int64(record.Expiry.Seconds()),
},
}, client.WithAddress(s.Nodes...))
if err != nil && errors.Equal(err, errors.NotFound("", "")) {
return store.ErrNotFound
}
return err
}
@@ -138,9 +141,10 @@ func (s *serviceStore) Delete(key string, opts ...store.DeleteOption) error {
_, err := s.Client.Delete(s.Context(), &pb.DeleteRequest{
Key: key,
}, client.WithAddress(s.Nodes...))
if verr, ok := err.(*errors.Error); ok && verr.Code == 404 {
if err != nil && errors.Equal(err, errors.NotFound("", "")) {
return store.ErrNotFound
}
return err
}