zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete duplicated crash recover logic. (#1950)

Browse Source 
* Update statinterceptor.go

* Update statinterceptor_test.go
This commit is contained in:
kunyu
2022-06-01 22:53:05 +08:00
committed by GitHub
parent 35425f6164
commit 65098d4737
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zrpc/internal/serverinterceptors/statinterceptor.go
View File

@@ -26,9 +26,6 @@ func SetSlowThreshold(threshold time.Duration) {
func UnaryStatInterceptor(metrics *stat.Metrics) grpc.UnaryServerInterceptor { func UnaryStatInterceptor(metrics *stat.Metrics) grpc.UnaryServerInterceptor {
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo,
handler grpc.UnaryHandler) (resp interface{}, err error) { handler grpc.UnaryHandler) (resp interface{}, err error) {
defer handleCrash(func(r interface{}) {
err = toPanicError(r)
})
startTime := timex.Now() startTime := timex.Now()
defer func() { defer func() {

11
zrpc/internal/serverinterceptors/statinterceptor_test.go
View File

@@ -30,17 +30,6 @@ func TestUnaryStatInterceptor(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
} }
func TestUnaryStatInterceptor_crash(t *testing.T) {
metrics := stat.NewMetrics("mock")
interceptor := UnaryStatInterceptor(metrics)
_, err := interceptor(context.Background(), nil, &grpc.UnaryServerInfo{
FullMethod: "/",
}, func(ctx context.Context, req interface{}) (interface{}, error) {
panic("error")
})
assert.NotNil(t, err)
}
func TestLogDuration(t *testing.T) { func TestLogDuration(t *testing.T) {
addrs, err := net.InterfaceAddrs() addrs, err := net.InterfaceAddrs()
assert.Nil(t, err) assert.Nil(t, err)