From a82f0323a434afaf2f6a8c5511f7eeb99e919ad3 Mon Sep 17 00:00:00 2001 From: Ian Cottrell Date: Fri, 14 Jun 2019 13:17:16 -0400 Subject: [PATCH] internal/lsp: block rather than reject when the message queue is full Change-Id: Ic8d4a0a4abfed71fe9290e9aae4efd6ab55124d5 Reviewed-on: https://go-review.googlesource.com/c/tools/+/182458 Run-TryBot: Ian Cottrell Reviewed-by: Rebecca Stambler --- internal/lsp/protocol/protocol.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/lsp/protocol/protocol.go b/internal/lsp/protocol/protocol.go index eebfb245..c164e065 100644 --- a/internal/lsp/protocol/protocol.go +++ b/internal/lsp/protocol/protocol.go @@ -12,6 +12,7 @@ import ( ) const defaultMessageBufferSize = 20 +const defaultRejectIfOverloaded = false func canceller(ctx context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) { conn.Notify(context.Background(), "$/cancelRequest", &CancelParams{ID: *req.ID}) @@ -21,7 +22,7 @@ func NewClient(stream jsonrpc2.Stream, client Client) (*jsonrpc2.Conn, Server, x log := xlog.New(NewLogger(client)) conn := jsonrpc2.NewConn(stream) conn.Capacity = defaultMessageBufferSize - conn.RejectIfOverloaded = true + conn.RejectIfOverloaded = defaultRejectIfOverloaded conn.Handler = clientHandler(log, client) conn.Canceler = jsonrpc2.Canceler(canceller) return conn, &serverDispatcher{Conn: conn}, log @@ -32,7 +33,7 @@ func NewServer(stream jsonrpc2.Stream, server Server) (*jsonrpc2.Conn, Client, x client := &clientDispatcher{Conn: conn} log := xlog.New(NewLogger(client)) conn.Capacity = defaultMessageBufferSize - conn.RejectIfOverloaded = true + conn.RejectIfOverloaded = defaultRejectIfOverloaded conn.Handler = serverHandler(log, server) conn.Canceler = jsonrpc2.Canceler(canceller) return conn, client, log