From 869880a2383b11224e53133fa6e75284972215cc Mon Sep 17 00:00:00 2001
From: a <a@a.a>
Date: Sun, 25 Sep 2022 05:49:32 -0500
Subject: [PATCH] remove reover by defualt
---
service.go | 25 +++++++++++--------------
wsjson/wsjson.go | 1 -
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/service.go b/service.go
index 058b70e..c75f313 100644
--- a/service.go
+++ b/service.go
@@ -19,10 +19,7 @@ package jrpc
import (
"context"
"reflect"
- "runtime"
"unicode"
-
- "git.tuxpa.in/a/zlog/log"
)
var (
@@ -97,17 +94,17 @@ func (e *callback) ServeRPC(w ResponseWriter, r *Request) {
}
fullargs = append(fullargs, args...)
// Catch panic while running the callback.
- defer func() {
- if err := recover(); err != nil {
- const size = 64 << 10
- buf := make([]byte, size)
- buf = buf[:runtime.Stack(buf, false)]
- log.Error().Str("method", r.msg.Method).Interface("err", err).Hex("buf", buf).Msg("crashed")
- // errRes := errors.New("method handler crashed: " + fmt.Sprint(err))
- w.Send(nil, nil)
- return
- }
- }()
+ //defer func() {
+ // if err := recover(); err != nil {
+ // const size = 64 << 10
+ // buf := make([]byte, size)
+ // buf = buf[:runtime.Stack(buf, false)]
+ // log.Error().Str("method", r.msg.Method).Interface("err", err).Hex("buf", buf).Msg("crashed")
+ // // errRes := errors.New("method handler crashed: " + fmt.Sprint(err))
+ // w.Send(nil, nil)
+ // return
+ // }
+ //}()
// Run the callback.
results := e.fn.Call(fullargs)
if e.errPos >= 0 && !results[e.errPos].IsNil() {
diff --git a/wsjson/wsjson.go b/wsjson/wsjson.go
index fabd310..7ceedf3 100644
--- a/wsjson/wsjson.go
+++ b/wsjson/wsjson.go
@@ -32,7 +32,6 @@ func Read(ctx context.Context, c *websocket.Conn, v interface{}) error {
}
func read(ctx context.Context, c *websocket.Conn, v interface{}) (err error) {
-
_, r, err := c.Reader(ctx)
if err != nil {
return err
--
GitLab