summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2018-03-28 15:59:29 -0500
committerPaul J. Davis <paul.joseph.davis@gmail.com>2018-03-28 19:02:55 -0500
commit790783e3f8210537aa5c691a90b3608a5c218f72 (patch)
tree2328f18a90f9c2ad01c7f0d3650c91af0e346c35
parent99a64b2508e815e5a820c802b0d9c802659e72d3 (diff)
downloadcouchdb-790783e3f8210537aa5c691a90b3608a5c218f72.tar.gz
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.
-rw-r--r--src/couch/src/couch_os_process.erl1
1 files changed, 0 insertions, 1 deletions
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 =