From 790783e3f8210537aa5c691a90b3608a5c218f72 Mon Sep 17 00:00:00 2001 From: "Paul J. Davis" Date: Wed, 28 Mar 2018 15:59:29 -0500 Subject: Fix killing of OS processes This was a latent bad merge that failed to remove the duplicate receive statement. This ended up discarding the monitor's 'DOWN' message which leads to an infinite loop in couch_os_proces:killer/1. --- src/couch/src/couch_os_process.erl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/couch/src/couch_os_process.erl b/src/couch/src/couch_os_process.erl index fb1f1427f..63a241433 100644 --- a/src/couch/src/couch_os_process.erl +++ b/src/couch/src/couch_os_process.erl @@ -167,7 +167,6 @@ init([Command, Options, PortOptions]) -> spawn(fun() -> % this ensure the real os process is killed when this process dies. erlang:monitor(process, Pid), - receive _ -> ok end, killer(?b2l(KillCmd)) end), OsProc = -- cgit v1.2.1