Skip to content
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

Jump to bottom

Ignore SIGPIPE in the Merlin server process #1746

Merged
merged 4 commits into from
Apr 19, 2024
Merged

Ignore SIGPIPE in the Merlin server process #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f540fcd
Ignore SIGPIPE in the Merlin server process
liam923 Apr 4, 2024
9df2ed8
Ignore SIGPIPE only on unix
liam923 Apr 5, 2024
a3a3181
Update changelog
liam923 Apr 8, 2024
4b4d637
Use set_signal to avoid ignore
liam923 Apr 18, 2024
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ merlin NEXT_VERSION
- destruct: Removal of residual patterns (#1737, fixes #1560)
- Do not erase fields' names when destructing punned record fields (#1734,
fixes #1661)
- Ignore SIGPIPE in the Merlin server process (#1746)

merlin 4.14
===========
Expand Down
2 changes: 2 additions & 0 deletions src/frontend/ocamlmerlin/ocamlmerlin_server.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ module Server = struct
| None ->
Logger.log ~section:"server" ~title:"cannot setup listener" ""
| Some server ->
(* If the client closes its connection, don't let it kill us with a SIGPIPE. *)
if Sys.unix then Sys.set_signal Sys.sigpipe Sys.Signal_ignore;
loop (File_id.get Sys.executable_name) server;
Os_ipc.server_close server
end
Expand Down
Loading