diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-03-28 15:59:29 -0500 |
|---|---|---|
| committer | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-03-28 15:59:29 -0500 |
| commit | 57f3b523be8707bdd7b9e6a794eac95dbd1aefd9 (patch) | |
| tree | 2ccedd858a778c0a46965531fbdfa0d485a4f08b | |
| parent | f6fc28560680e513c06d2c763ce350e3b35bf912 (diff) | |
| download | couchdb-57f3b523be8707bdd7b9e6a794eac95dbd1aefd9.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.erl | 1 |
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 = |