Skip to content

Add panic handler to sendrpcmessage to catch channel errors #1938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
esimkowitz merged 3 commits into from
Feb 10, 2025
Merged

Add panic handler to sendrpcmessage to catch channel errors #1938

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2519411
Add panic handler to sendrpcmessage to catch channel errors
esimkowitz Feb 9, 2025
650b040
Merge branch 'main' into evan/sendrpc-panic
esimkowitz Feb 9, 2025
ba8bab3
add todo
esimkowitz Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/wshutil/wshproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"sync"

"github.com/google/uuid"
"github.com/wavetermdev/waveterm/pkg/panichandler"
"github.com/wavetermdev/waveterm/pkg/util/shellutil"
"github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/waveterm/pkg/wshrpc"
Expand Down Expand Up @@ -247,7 +248,11 @@ func (p *WshRpcProxy) HandleAuthentication() (*wshrpc.RpcContext, error) {
}
}

// TODO: Figure out who is sending to closed routes and why we're not catching it
func (p *WshRpcProxy) SendRpcMessage(msg []byte) {
defer func() {
panichandler.PanicHandler("WshRpcProxy.SendRpcMessage", recover())
}()
p.ToRemoteCh <- msg
}

Expand Down
Loading