good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jrpc
Manage
Activity
Members
Labels
Plan
Issues
6
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
4
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
jrpc
Commits
57b9f37c
Verified
Commit
57b9f37c
authored
1 year ago
by
a
Browse files
Options
Downloads
Patches
Plain Diff
add some logs
parent
6256ffd7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#29954
failed with stage
Stage: test
in 11 minutes and 38 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/codecs/broker/server.go
+5
-1
5 additions, 1 deletion
contrib/codecs/broker/server.go
contrib/codecs/http/handler.go
+5
-1
5 additions, 1 deletion
contrib/codecs/http/handler.go
contrib/codecs/websocket/handler.go
+9
-2
9 additions, 2 deletions
contrib/codecs/websocket/handler.go
with
19 additions
and
4 deletions
contrib/codecs/broker/server.go
+
5
−
1
View file @
57b9f37c
...
@@ -2,6 +2,7 @@ package broker
...
@@ -2,6 +2,7 @@ package broker
import
(
import
(
"context"
"context"
"log/slog"
"gfx.cafe/open/jrpc/pkg/server"
"gfx.cafe/open/jrpc/pkg/server"
)
)
...
@@ -26,7 +27,10 @@ func (s *Server) ServeSpoke(ctx context.Context, stream ServerSpoke) {
...
@@ -26,7 +27,10 @@ func (s *Server) ServeSpoke(ctx context.Context, stream ServerSpoke) {
}
}
cd
:=
NewCodec
(
req
,
fn
)
cd
:=
NewCodec
(
req
,
fn
)
go
func
()
{
go
func
()
{
s
.
Server
.
ServeCodec
(
ctx
,
cd
)
err
:=
s
.
Server
.
ServeCodec
(
ctx
,
cd
)
if
err
!=
nil
{
slog
.
Error
(
"codec err"
,
"err"
,
err
)
}
cd
.
Close
()
cd
.
Close
()
}()
}()
}
}
...
...
This diff is collapsed.
Click to expand it.
contrib/codecs/http/handler.go
+
5
−
1
View file @
57b9f37c
package
http
package
http
import
(
import
(
"log/slog"
"net/http"
"net/http"
"sync"
"sync"
...
@@ -29,7 +30,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
...
@@ -29,7 +30,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
c
:=
codecPool
.
Get
()
.
(
*
Codec
)
c
:=
codecPool
.
Get
()
.
(
*
Codec
)
c
.
Reset
(
w
,
r
)
c
.
Reset
(
w
,
r
)
w
.
Header
()
.
Set
(
"content-type"
,
contentType
)
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
()
{
go
func
()
{
<-
c
.
Closed
()
<-
c
.
Closed
()
codecPool
.
Put
(
c
)
codecPool
.
Put
(
c
)
...
...
This diff is collapsed.
Click to expand it.
contrib/codecs/websocket/handler.go
+
9
−
2
View file @
57b9f37c
package
websocket
package
websocket
import
(
import
(
"log/slog"
"net/http"
"net/http"
"gfx.cafe/open/websocket"
"gfx.cafe/open/websocket"
...
@@ -23,7 +24,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
...
@@ -23,7 +24,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
return
}
}
c
:=
newWebsocketCodec
(
r
.
Context
(),
conn
,
""
,
r
.
Header
)
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.
// WebsocketHandler returns a handler that serves JSON-RPC to WebSocket connections.
...
@@ -41,6 +45,9 @@ func WebsocketHandler(s *server.Server, allowedOrigins []string) http.Handler {
...
@@ -41,6 +45,9 @@ func WebsocketHandler(s *server.Server, allowedOrigins []string) http.Handler {
return
return
}
}
codec
:=
newWebsocketCodec
(
r
.
Context
(),
conn
,
r
.
Host
,
r
.
Header
)
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
)
}
})
})
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment