mirror of
https://github.com/sourcegraph/jsonrpc2.git
synced 2026-06-16 04:04:56 +02:00
Add ability to set custom logger (#48)
Before this commit, a custom logger could be set with the LogMessages function. However, by using LogMessages not only is a custom logger set but also all received and sent messages are logged. Use cases exist where a custom logger is desired to log errors but not all messages.
This commit is contained in:
parent
5f298fe6a1
commit
c9c77b6bb9
2 changed files with 60 additions and 0 deletions
|
|
@ -102,3 +102,10 @@ func LogMessages(logger Logger) ConnOpt {
|
|||
})(c)
|
||||
}
|
||||
}
|
||||
|
||||
// SetLogger sets the logger for the connection.
|
||||
func SetLogger(logger Logger) ConnOpt {
|
||||
return func(c *Conn) {
|
||||
c.logger = logger
|
||||
}
|
||||
}
|
||||
|
|
|
|||
53
conn_opt_test.go
Normal file
53
conn_opt_test.go
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
package jsonrpc2_test
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"io"
|
||||
"log"
|
||||
"net"
|
||||
"testing"
|
||||
|
||||
"github.com/sourcegraph/jsonrpc2"
|
||||
)
|
||||
|
||||
func TestSetLogger(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
rd, wr := io.Pipe()
|
||||
defer rd.Close()
|
||||
defer wr.Close()
|
||||
|
||||
buf := bufio.NewReader(rd)
|
||||
logger := log.New(wr, "", log.Lmsgprefix)
|
||||
|
||||
a, b := net.Pipe()
|
||||
connA := jsonrpc2.NewConn(
|
||||
ctx,
|
||||
jsonrpc2.NewBufferedStream(a, jsonrpc2.VSCodeObjectCodec{}),
|
||||
noopHandler{},
|
||||
jsonrpc2.SetLogger(logger),
|
||||
)
|
||||
connB := jsonrpc2.NewConn(
|
||||
ctx,
|
||||
jsonrpc2.NewBufferedStream(b, jsonrpc2.VSCodeObjectCodec{}),
|
||||
noopHandler{},
|
||||
)
|
||||
defer connA.Close()
|
||||
defer connB.Close()
|
||||
|
||||
// Write a response with no corresponding request.
|
||||
if err := connB.Reply(ctx, jsonrpc2.ID{Num: 0}, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
want := "jsonrpc2: ignoring response #0 with no corresponding request\n"
|
||||
got, err := buf.ReadString('\n')
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got != want {
|
||||
t.Fatalf("got %q, want %q", got, want)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue