bump google.golang.org/grpc v1.20.1
full diff: https://github.com/grpc/grpc-go/compare/v1.12.2...v1.20.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
		
							
								
								
									
										25
									
								
								vendor/google.golang.org/grpc/status/status.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										25
									
								
								vendor/google.golang.org/grpc/status/status.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -28,6 +28,7 @@
 | 
			
		||||
package status
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"errors"
 | 
			
		||||
	"fmt"
 | 
			
		||||
 | 
			
		||||
@@ -126,7 +127,9 @@ func FromError(err error) (s *Status, ok bool) {
 | 
			
		||||
	if err == nil {
 | 
			
		||||
		return &Status{s: &spb.Status{Code: int32(codes.OK)}}, true
 | 
			
		||||
	}
 | 
			
		||||
	if se, ok := err.(interface{ GRPCStatus() *Status }); ok {
 | 
			
		||||
	if se, ok := err.(interface {
 | 
			
		||||
		GRPCStatus() *Status
 | 
			
		||||
	}); ok {
 | 
			
		||||
		return se.GRPCStatus(), true
 | 
			
		||||
	}
 | 
			
		||||
	return New(codes.Unknown, err.Error()), false
 | 
			
		||||
@@ -182,8 +185,26 @@ func Code(err error) codes.Code {
 | 
			
		||||
	if err == nil {
 | 
			
		||||
		return codes.OK
 | 
			
		||||
	}
 | 
			
		||||
	if se, ok := err.(interface{ GRPCStatus() *Status }); ok {
 | 
			
		||||
	if se, ok := err.(interface {
 | 
			
		||||
		GRPCStatus() *Status
 | 
			
		||||
	}); ok {
 | 
			
		||||
		return se.GRPCStatus().Code()
 | 
			
		||||
	}
 | 
			
		||||
	return codes.Unknown
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// FromContextError converts a context error into a Status.  It returns a
 | 
			
		||||
// Status with codes.OK if err is nil, or a Status with codes.Unknown if err is
 | 
			
		||||
// non-nil and not a context error.
 | 
			
		||||
func FromContextError(err error) *Status {
 | 
			
		||||
	switch err {
 | 
			
		||||
	case nil:
 | 
			
		||||
		return New(codes.OK, "")
 | 
			
		||||
	case context.DeadlineExceeded:
 | 
			
		||||
		return New(codes.DeadlineExceeded, err.Error())
 | 
			
		||||
	case context.Canceled:
 | 
			
		||||
		return New(codes.Canceled, err.Error())
 | 
			
		||||
	default:
 | 
			
		||||
		return New(codes.Unknown, err.Error())
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user