diff options
| author | Nick Vatamaniuc <vatamane@gmail.com> | 2021-05-07 15:47:36 -0400 |
|---|---|---|
| committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2021-05-10 11:26:05 -0400 |
| commit | e69184a81b8188a04c836bc2816e00c7833295f5 (patch) | |
| tree | e1ecb1199d397c9a0c150590247c37abeec51f14 | |
| parent | f130ae1c7ef8849da911f36861a8af32bc70e723 (diff) | |
| download | couchdb-e69184a81b8188a04c836bc2816e00c7833295f5.tar.gz | |
Bump ibrowse to 4.4.2 + couchdb patches
Set the `worker_trap_exits = false` setting to ensure our replication worker
pool properly cleans up worker processes.
Ref: https://github.com/apache/couchdb/pull/3208
| -rw-r--r-- | rebar.config.script | 2 | ||||
| -rw-r--r-- | src/couch_replicator/src/couch_replicator_connection.erl | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/rebar.config.script b/rebar.config.script index 789c42da1..214918238 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -151,7 +151,7 @@ DepDescs = [ %% Third party deps {folsom, "folsom", {tag, "CouchDB-0.8.3"}}, {hyper, "hyper", {tag, "CouchDB-2.2.0-6"}}, -{ibrowse, "ibrowse", {tag, "CouchDB-4.0.1-2"}}, +{ibrowse, "ibrowse", {tag, "CouchDB-4.4.2-2"}}, {jaeger_passage, "jaeger-passage", {tag, "CouchDB-0.1.14-2"}}, {jiffy, "jiffy", {tag, "CouchDB-1.0.5-1"}}, {local, "local", {tag, "0.2.1"}}, diff --git a/src/couch_replicator/src/couch_replicator_connection.erl b/src/couch_replicator/src/couch_replicator_connection.erl index ace93d545..8082ef438 100644 --- a/src/couch_replicator/src/couch_replicator_connection.erl +++ b/src/couch_replicator/src/couch_replicator_connection.erl @@ -73,7 +73,10 @@ init([]) -> Interval = config:get_integer("replicator", "connection_close_interval", ?DEFAULT_CLOSE_INTERVAL), Timer = erlang:send_after(Interval, self(), close_idle_connections), - ibrowse:add_config([{inactivity_timeout, Interval}]), + ibrowse:add_config([ + {inactivity_timeout, Interval}, + {worker_trap_exits, false} + ]), {ok, #state{close_interval=Interval, timer=Timer}}. acquire(Url) -> |