[couchdb] branch master updated: Fix killing of OS processes

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 790783e  Fix killing of OS processes
790783e is described below

commit 790783e3f8210537aa5c691a90b3608a5c218f72
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Wed Mar 28 15:59:29 2018 -0500

    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 fb1f142..63a2414 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 =

-- 
To stop receiving notification emails like this one, please contact
davisp@apache.org.