good morning!!!!

Skip to content
Snippets Groups Projects
Verified Commit 8eee70d4 authored by a's avatar a
Browse files

jz

parent 7ee9f2ea
No related branches found
Tags v0.3.7
No related merge requests found
Pipeline #29963 failed
...@@ -2,7 +2,6 @@ package broker ...@@ -2,7 +2,6 @@ package broker
import ( import (
"context" "context"
"log/slog"
"gfx.cafe/open/jrpc/pkg/server" "gfx.cafe/open/jrpc/pkg/server"
) )
...@@ -29,7 +28,7 @@ func (s *Server) ServeSpoke(ctx context.Context, stream ServerSpoke) { ...@@ -29,7 +28,7 @@ func (s *Server) ServeSpoke(ctx context.Context, stream ServerSpoke) {
go func() { go func() {
err := s.Server.ServeCodec(ctx, cd) err := s.Server.ServeCodec(ctx, cd)
if err != nil { if err != nil {
slog.Error("codec err", "err", err) // slog.Error("codec err", "err", err)
} }
cd.Close() cd.Close()
}() }()
......
package http package http
import ( import (
"log/slog"
"net/http" "net/http"
"sync" "sync"
...@@ -32,7 +31,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { ...@@ -32,7 +31,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.Header().Set("content-type", contentType) w.Header().Set("content-type", contentType)
err := s.Server.ServeCodec(r.Context(), c) err := s.Server.ServeCodec(r.Context(), c)
if err != nil { if err != nil {
slog.Error("codec err", "err", err) // slog.Error("codec err", "err", err)
} }
go func() { go func() {
<-c.Closed() <-c.Closed()
......
...@@ -47,7 +47,7 @@ func WebsocketHandler(s *server.Server, allowedOrigins []string) http.Handler { ...@@ -47,7 +47,7 @@ func WebsocketHandler(s *server.Server, allowedOrigins []string) http.Handler {
codec := newWebsocketCodec(r.Context(), conn, r.Host, r.Header) codec := newWebsocketCodec(r.Context(), conn, r.Host, r.Header)
err = s.ServeCodec(r.Context(), codec) err = s.ServeCodec(r.Context(), codec)
if err != nil { if err != nil {
slog.Error("codec err", "error", err) // slog.Error("codec err", "error", err)
} }
}) })
} }
...@@ -2,6 +2,7 @@ package server ...@@ -2,6 +2,7 @@ package server
import ( import (
"context" "context"
"log/slog"
"sync" "sync"
"gfx.cafe/open/jrpc/pkg/codec" "gfx.cafe/open/jrpc/pkg/codec"
...@@ -252,10 +253,11 @@ func (c *callResponder) send(ctx context.Context, env *callEnv) (err error) { ...@@ -252,10 +253,11 @@ func (c *callResponder) send(ctx context.Context, env *callEnv) (err error) {
e.Null() e.Null()
} }
}) })
// a json encoding error here is possibly fatal.... try to encode the error, but there are no promises
} }
}) })
// a json encoding error here is possibly fatal....
if err != nil { if err != nil {
slog.Error("codec json encoding err", "err", err)
return err return err
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment