fix: use sigterm instead of sigkill/sigint

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Jul 13, 2024 · 2f647f1 · 2f647f1
1 parent 0c7be13
commit 2f647f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+# Unreelased
+
+## Fixes
+
+- Kill unnecessary ocamlformat processes with sigterm rather than sigint or
+  sigkill (#1343)
+
 # 1.18.0
 
 ## Features

diff --git a/ocaml-lsp-server/src/ocamlformat.ml b/ocaml-lsp-server/src/ocamlformat.ml
@@ -28,7 +28,7 @@ let run_command cancel prog stdin_value args =
           res, Fiber.Cancel.Not_cancelled
       | Some token ->
         let on_cancel () =
-          Unix.kill (Pid.to_int pid) Sys.sigint;
+          Unix.kill (Pid.to_int pid) Sys.sigterm;
           Fiber.return ()
         in
         fun f -> Fiber.Cancel.with_handler token ~on_cancel f

diff --git a/ocaml-lsp-server/src/ocamlformat_rpc.ml b/ocaml-lsp-server/src/ocamlformat_rpc.ml
@@ -91,7 +91,7 @@ end = struct
     | Error (`Msg msg) ->
       (* The process did start but something went wrong when negociating the
          version so we need to kill it *)
-      Unix.kill pid Sys.sigkill;
+      Unix.kill pid Sys.sigterm;
       let* () =
         let message =
           Printf.sprintf