github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 09:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #889 (#912)

Browse Source
This commit is contained in:
Kevin Wan 2021-08-15 15:33:45 +08:00 committed by GitHub
parent fc04ad7854
commit a21ff71373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/fx/timeout.go
View File

@ -2,6 +2,9 @@ package fx
import (
"context"
"fmt"
"runtime/debug"
"strings"
"time"
)
@ -30,7 +33,8 @@ func DoWithTimeout(fn func() error, timeout time.Duration, opts ...DoOption) err
go func() {
defer func() {
if p := recover(); p != nil {
panicChan <- p
// attach call stack to avoid missing in different goroutine
panicChan <- fmt.Sprintf("%+v\n\n%s", p, strings.TrimSpace(string(debug.Stack())))
}
}()
done <- fn()

2
zrpc/internal/serverinterceptors/crashinterceptor.go
View File

@ -39,6 +39,6 @@ func handleCrash(handler func(interface{})) {
}
func toPanicError(r interface{}) error {
logx.Errorf("%+v %s", r, debug.Stack())
logx.Errorf("%+v\n\n%s", r, debug.Stack())
return status.Errorf(codes.Internal, "panic: %v", r)
}

6
zrpc/internal/serverinterceptors/timeoutinterceptor.go
View File

@ -2,6 +2,9 @@ package serverinterceptors
import (
"context"
"fmt"
"runtime/debug"
"strings"
"sync"
"time"
@ -24,7 +27,8 @@ func UnaryTimeoutInterceptor(timeout time.Duration) grpc.UnaryServerInterceptor
go func() {
defer func() {
if p := recover(); p != nil {
panicChan <- p
// attach call stack to avoid missing in different goroutine
panicChan <- fmt.Sprintf("%+v\n\n%s", p, strings.TrimSpace(string(debug.Stack())))
}
}()