From 57b9f37ca9344a619ce8a4539d393976a91d52fc Mon Sep 17 00:00:00 2001
From: a <a@tuxpa.in>
Date: Thu, 26 Oct 2023 10:37:07 -0500
Subject: [PATCH] add some logs
---
contrib/codecs/broker/server.go | 6 +++++-
contrib/codecs/http/handler.go | 6 +++++-
contrib/codecs/websocket/handler.go | 11 +++++++++--
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/contrib/codecs/broker/server.go b/contrib/codecs/broker/server.go
index 6e76c20..c92f0b3 100644
--- a/contrib/codecs/broker/server.go
+++ b/contrib/codecs/broker/server.go
@@ -2,6 +2,7 @@ package broker
import (
"context"
+ "log/slog"
"gfx.cafe/open/jrpc/pkg/server"
)
@@ -26,7 +27,10 @@ func (s *Server) ServeSpoke(ctx context.Context, stream ServerSpoke) {
}
cd := NewCodec(req, fn)
go func() {
- s.Server.ServeCodec(ctx, cd)
+ err := s.Server.ServeCodec(ctx, cd)
+ if err != nil {
+ slog.Error("codec err", "err", err)
+ }
cd.Close()
}()
}
diff --git a/contrib/codecs/http/handler.go b/contrib/codecs/http/handler.go
index b3ba786..d677dfc 100644
--- a/contrib/codecs/http/handler.go
+++ b/contrib/codecs/http/handler.go
@@ -1,6 +1,7 @@
package http
import (
+ "log/slog"
"net/http"
"sync"
@@ -29,7 +30,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
c := codecPool.Get().(*Codec)
c.Reset(w, r)
w.Header().Set("content-type", contentType)
- s.Server.ServeCodec(r.Context(), c)
+ err := s.Server.ServeCodec(r.Context(), c)
+ if err != nil {
+ slog.Error("codec err", "err", err)
+ }
go func() {
<-c.Closed()
codecPool.Put(c)
diff --git a/contrib/codecs/websocket/handler.go b/contrib/codecs/websocket/handler.go
index bbbf8c4..7114f06 100644
--- a/contrib/codecs/websocket/handler.go
+++ b/contrib/codecs/websocket/handler.go
@@ -1,6 +1,7 @@
package websocket
import (
+ "log/slog"
"net/http"
"gfx.cafe/open/websocket"
@@ -23,7 +24,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}
c := newWebsocketCodec(r.Context(), conn, "", r.Header)
- s.Server.ServeCodec(r.Context(), c)
+ err = s.Server.ServeCodec(r.Context(), c)
+ if err != nil {
+ slog.Error("codec err", "error", err)
+ }
}
// WebsocketHandler returns a handler that serves JSON-RPC to WebSocket connections.
@@ -41,6 +45,9 @@ func WebsocketHandler(s *server.Server, allowedOrigins []string) http.Handler {
return
}
codec := newWebsocketCodec(r.Context(), conn, r.Host, r.Header)
- s.ServeCodec(r.Context(), codec)
+ err = s.ServeCodec(r.Context(), codec)
+ if err != nil {
+ slog.Error("codec err", "error", err)
+ }
})
}
--
GitLab