mirror of
https://github.com/duanhf2012/origin.git
synced 2026-02-03 22:45:13 +08:00
异常宕机捕获处理
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/duanhf2012/origin/log"
|
||||
"runtime"
|
||||
"sync"
|
||||
)
|
||||
|
||||
@@ -78,3 +80,17 @@ func (slf *EventProcessor) SetEventReciver(eventProcessor IEventProcessor){
|
||||
func (slf *EventProcessor) GetEventReciver() IEventProcessor{
|
||||
return slf.eventReciver
|
||||
}
|
||||
|
||||
|
||||
func (slf *EventProcessor) EventHandler(processor IEventProcessor,ev *Event) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
buf := make([]byte, 40960)
|
||||
l := runtime.Stack(buf, false)
|
||||
err := fmt.Errorf("%v: %s", r, buf[:l])
|
||||
log.Error("core dump info:%+v\n",err)
|
||||
}
|
||||
}()
|
||||
|
||||
processor.OnEventHandler(ev)
|
||||
}
|
||||
@@ -24,10 +24,11 @@ func NewPBProcessor() *PBProcessor {
|
||||
return processor
|
||||
}
|
||||
|
||||
func (slf *PBProcessor) SetLittleEndian(littleEndian bool){
|
||||
slf.LittleEndian = littleEndian
|
||||
func (p *PBProcessor) SetByteOrder(littleEndian bool) {
|
||||
p.LittleEndian = littleEndian
|
||||
}
|
||||
|
||||
|
||||
type PBPackInfo struct {
|
||||
typ uint16
|
||||
msg proto.Message
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"github.com/duanhf2012/origin/log"
|
||||
"reflect"
|
||||
"runtime"
|
||||
"strings"
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
@@ -168,6 +169,15 @@ func (slf *RpcHandler) GetRpcResponeChan() chan *Call{
|
||||
}
|
||||
|
||||
func (slf *RpcHandler) HandlerRpcResponeCB(call *Call){
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
buf := make([]byte, LenStackBuf)
|
||||
l := runtime.Stack(buf, false)
|
||||
err := fmt.Errorf("%v: %s\n", r, buf[:l])
|
||||
log.Error("core dump info:%+v",err)
|
||||
}
|
||||
}()
|
||||
|
||||
if call.Err == nil {
|
||||
call.callback.Call([]reflect.Value{reflect.ValueOf(call.Reply),NilError})
|
||||
}else{
|
||||
@@ -176,8 +186,20 @@ func (slf *RpcHandler) HandlerRpcResponeCB(call *Call){
|
||||
|
||||
}
|
||||
|
||||
var LenStackBuf int = 40960
|
||||
|
||||
func (slf *RpcHandler) HandlerRpcRequest(request *RpcRequest) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
buf := make([]byte, LenStackBuf)
|
||||
l := runtime.Stack(buf, false)
|
||||
err := fmt.Errorf("%v: %s", r, buf[:l])
|
||||
log.Error("core dump info:%+v\n",err)
|
||||
rpcErr := RpcError("call error : core dumps")
|
||||
request.requestHandle(nil,&rpcErr)
|
||||
}
|
||||
}()
|
||||
|
||||
v,ok := slf.mapfunctons[request.ServiceMethod]
|
||||
if ok == false {
|
||||
err := Errorf("RpcHandler %s cannot find %s",slf.rpcHandler.GetName(),request.ServiceMethod)
|
||||
|
||||
@@ -77,14 +77,6 @@ type RpcAgent struct {
|
||||
userData interface{}
|
||||
}
|
||||
|
||||
type RpcRequestRw struct {
|
||||
//
|
||||
ServiceMethod string // format: "Service.Method"
|
||||
//Seq uint64 // sequence number chosen by client
|
||||
InputParam []byte
|
||||
|
||||
requestHandle RequestHandler
|
||||
}
|
||||
|
||||
func (agent *RpcAgent) WriteRespone(serviceMethod string,seq uint64,reply interface{},err *RpcError) {
|
||||
var rpcRespone RpcResponse
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/duanhf2012/origin/event"
|
||||
"github.com/duanhf2012/origin/log"
|
||||
"github.com/duanhf2012/origin/rpc"
|
||||
"github.com/duanhf2012/origin/util/timer"
|
||||
"reflect"
|
||||
"runtime"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
)
|
||||
@@ -27,7 +30,6 @@ type IService interface {
|
||||
}
|
||||
|
||||
|
||||
|
||||
type Service struct {
|
||||
Module
|
||||
rpc.RpcHandler //rpc
|
||||
@@ -38,6 +40,7 @@ type Service struct {
|
||||
serviceCfg interface{}
|
||||
gorouterNum int32
|
||||
startStatus bool
|
||||
|
||||
}
|
||||
|
||||
func (slf *Service) OnSetup(iservice IService){
|
||||
@@ -82,6 +85,7 @@ func (slf *Service) Start() {
|
||||
}
|
||||
|
||||
func (slf *Service) Run() {
|
||||
|
||||
defer slf.wg.Done()
|
||||
var bStop = false
|
||||
for{
|
||||
@@ -96,7 +100,7 @@ func (slf *Service) Run() {
|
||||
case rpcResponeCB := <- rpcResponeCallBack:
|
||||
slf.GetRpcHandler().HandlerRpcResponeCB(rpcResponeCB)
|
||||
case ev := <- eventChan:
|
||||
slf.this.(event.IEventProcessor).OnEventHandler(ev)
|
||||
slf.EventHandler(slf.this.(event.IEventProcessor),ev)
|
||||
case t := <- slf.dispatcher.ChanTimer:
|
||||
t.Cb()
|
||||
}
|
||||
@@ -118,6 +122,16 @@ func (slf *Service) GetName() string{
|
||||
|
||||
|
||||
func (slf *Service) OnRelease(){
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
buf := make([]byte, 40960)
|
||||
l := runtime.Stack(buf, false)
|
||||
err := fmt.Errorf("%v: %s", r, buf[:l])
|
||||
log.Error("core dump info:%+v\n",err)
|
||||
}
|
||||
}()
|
||||
|
||||
slf.this.OnRelease()
|
||||
}
|
||||
|
||||
func (slf *Service) OnInit() error {
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package timer
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/duanhf2012/origin/log"
|
||||
"runtime"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -28,20 +31,14 @@ func (t *Timer) Stop() {
|
||||
}
|
||||
|
||||
func (t *Timer) Cb() {
|
||||
/*
|
||||
defer func() {
|
||||
t.cb = nil
|
||||
if r := recover(); r != nil {
|
||||
if conf.LenStackBuf > 0 {
|
||||
buf := make([]byte, conf.LenStackBuf)
|
||||
l := runtime.Stack(buf, false)
|
||||
log.Error("%v: %s", r, buf[:l])
|
||||
} else {
|
||||
log.Error("%v", r)
|
||||
}
|
||||
buf := make([]byte, 40960)
|
||||
l := runtime.Stack(buf, false)
|
||||
err := fmt.Errorf("%v: %s", r, buf[:l])
|
||||
log.Error("core dump info:%+v\n",err)
|
||||
}
|
||||
}()
|
||||
*/
|
||||
|
||||
if t.cbex!=nil {
|
||||
t.cbex(t)
|
||||
|
||||
Reference in New Issue
Block a user