From 8eee70d499e9626637c385017d4cb946d185b514 Mon Sep 17 00:00:00 2001
From: a <a@tuxpa.in>
Date: Thu, 26 Oct 2023 12:11:01 -0500
Subject: [PATCH] jz
---
contrib/codecs/broker/server.go | 3 +--
contrib/codecs/http/handler.go | 3 +--
contrib/codecs/websocket/handler.go | 2 +-
pkg/server/server.go | 4 +++-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/codecs/broker/server.go b/contrib/codecs/broker/server.go
index c92f0b3..b2c3f07 100644
--- a/contrib/codecs/broker/server.go
+++ b/contrib/codecs/broker/server.go
@@ -2,7 +2,6 @@ package broker
import (
"context"
- "log/slog"
"gfx.cafe/open/jrpc/pkg/server"
)
@@ -29,7 +28,7 @@ func (s *Server) ServeSpoke(ctx context.Context, stream ServerSpoke) {
go func() {
err := s.Server.ServeCodec(ctx, cd)
if err != nil {
- slog.Error("codec err", "err", err)
+ // slog.Error("codec err", "err", err)
}
cd.Close()
}()
diff --git a/contrib/codecs/http/handler.go b/contrib/codecs/http/handler.go
index d677dfc..b770092 100644
--- a/contrib/codecs/http/handler.go
+++ b/contrib/codecs/http/handler.go
@@ -1,7 +1,6 @@
package http
import (
- "log/slog"
"net/http"
"sync"
@@ -32,7 +31,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
w.Header().Set("content-type", contentType)
err := s.Server.ServeCodec(r.Context(), c)
if err != nil {
- slog.Error("codec err", "err", err)
+ // slog.Error("codec err", "err", err)
}
go func() {
<-c.Closed()
diff --git a/contrib/codecs/websocket/handler.go b/contrib/codecs/websocket/handler.go
index 7114f06..c2f9d27 100644
--- a/contrib/codecs/websocket/handler.go
+++ b/contrib/codecs/websocket/handler.go
@@ -47,7 +47,7 @@ func WebsocketHandler(s *server.Server, allowedOrigins []string) http.Handler {
codec := newWebsocketCodec(r.Context(), conn, r.Host, r.Header)
err = s.ServeCodec(r.Context(), codec)
if err != nil {
- slog.Error("codec err", "error", err)
+ // slog.Error("codec err", "error", err)
}
})
}
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 5551ea3..de6878b 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -2,6 +2,7 @@ package server
import (
"context"
+ "log/slog"
"sync"
"gfx.cafe/open/jrpc/pkg/codec"
@@ -252,10 +253,11 @@ func (c *callResponder) send(ctx context.Context, env *callEnv) (err error) {
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 {
+ slog.Error("codec json encoding err", "err", err)
return err
}
}
--
GitLab