unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 2 Actions 4 Packages Projects Releases 262 Wiki Activity

add recovery in case of panics

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2019-12-03 01:36:14 +03:00
parent 90f9b0d0c9
commit b8e96f45d4
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
server/rpc_router.go
View File

@ -12,12 +12,14 @@ import (
"fmt"
"io"
"reflect"
"runtime/debug"
"strings"
"sync"
"unicode"
"unicode/utf8"
"github.com/micro/go-micro/codec"
merrors "github.com/micro/go-micro/errors"
"github.com/micro/go-micro/util/log"
)
@ -505,6 +507,17 @@ func (router *router) Subscribe(s Subscriber) error {
}
func (router *router) ProcessMessage(ctx context.Context, msg Message) error {
var err error
defer func() {
// recover any panics
if r := recover(); r != nil {
log.Log("panic recovered: ", r)
log.Log(string(debug.Stack()))
err = merrors.InternalServerError("go.micro.server", "panic recovered: %v", r)
}
}()
router.su.RLock()
// get the subscribers by topic
@ -517,7 +530,7 @@ func (router *router) ProcessMessage(ctx context.Context, msg Message) error {
// unlock since we only need to get the subs
router.su.RUnlock()
var results []string
var errResults []string
// we may have multiple subscribers for the topic
for _, sub := range subs {
@ -557,12 +570,12 @@ func (router *router) ProcessMessage(ctx context.Context, msg Message) error {
cc := msg.Codec()
// read the header. mostly a noop
if err := cc.ReadHeader(&codec.Message{}, codec.Event); err != nil {
if err = cc.ReadHeader(&codec.Message{}, codec.Event); err != nil {
return err
}
// read the body into the handler request value
if err := cc.ReadBody(req.Interface()); err != nil {
if err = cc.ReadBody(req.Interface()); err != nil {
return err
}
@ -581,10 +594,10 @@ func (router *router) ProcessMessage(ctx context.Context, msg Message) error {
// execute the actuall call of the handler
returnValues := handler.method.Call(vals)
if err := returnValues[0].Interface(); err != nil {
return err.(error)
if rerr := returnValues[0].Interface(); rerr != nil {
err = rerr.(error)
}
return nil
return err
}
// wrap with subscriber wrappers
@ -603,16 +616,16 @@ func (router *router) ProcessMessage(ctx context.Context, msg Message) error {
}
// execute the message handler
if err := fn(ctx, rpcMsg); err != nil {
results = append(results, err.Error())
if err = fn(ctx, rpcMsg); err != nil {
errResults = append(errResults, err.Error())
}
}
}
// if no errors just return
if len(results) == 0 {
return nil
if len(errResults) > 0 {
err = merrors.InternalServerError("go.micro.server", "subscriber error: %v", strings.Join(errResults, "\n"))
}
return errors.New("subscriber error: " + strings.Join(results, "\n"))
return err
}

7
transport/grpc/handler.go
View File

@ -3,6 +3,7 @@ package grpc
import (
"runtime/debug"
"github.com/micro/go-micro/errors"
"github.com/micro/go-micro/transport"
pb "github.com/micro/go-micro/transport/grpc/proto"
"github.com/micro/go-micro/util/log"
@ -16,6 +17,8 @@ type microTransport struct {
}
func (m *microTransport) Stream(ts pb.Transport_StreamServer) error {
var err error
sock := &grpcTransportSocket{
stream: ts,
local: m.addr,
@ -30,10 +33,12 @@ func (m *microTransport) Stream(ts pb.Transport_StreamServer) error {
if r := recover(); r != nil {
log.Log(r, string(debug.Stack()))
sock.Close()
err = errors.InternalServerError("go.micro.transport", "panic recovered: %v", r)
}
}()
// execute socket func
m.fn(sock)
return nil
return err
}