Ignore SIGPIPE in the Merlin server process (#1746)

from liam923/ignore-sigpipe
ocaml · Apr 19, 2024 · 23e9de3 · 23e9de3
2 parents bfdf9f0 + 4b4d637
commit 23e9de3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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
 ===========

diff --git a/src/frontend/ocamlmerlin/ocamlmerlin_server.ml b/src/frontend/ocamlmerlin/ocamlmerlin_server.ml
@@ -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