Skip to content

Commit

Permalink
fix: kill dune ocaml-merlin in a friendlier way
Browse files Browse the repository at this point in the history
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

<!-- ps-id: d1282157-d8a9-41b4-93c2-572b4f2be978 -->
  • Loading branch information
rgrinberg committed Jun 8, 2023
1 parent 73678a6 commit c0bf37e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Fixes

- Kill unnecessary `$ dune ocaml-merlin` with SIGTERM rather than SIGKILL
(#1124)

- Refactor comment parsing to use `odoc-parser` and `cmarkit` instead of
`octavius` and `omd` (#1088)

Expand Down
2 changes: 1 addition & 1 deletion ocaml-lsp-server/src/merlin_config.ml
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,6 @@ module DB = struct
let* () = Fiber.return () in
Table.iter t.running ~f:(fun running ->
let pid = Pid.to_int running.process.pid in
Unix.kill pid Sys.sigkill);
Unix.kill pid Sys.sigterm);
Fiber.Pool.stop t.pool
end

0 comments on commit c0bf37e

Please sign in to comment.