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 13:55:10 -0400 |
| commit | 7b85048ec2566fe9b2eedabd51b992d5ac52b9a3 (patch) | |
| tree | 9ece5ef74c0a7b8039b2620875fb3f0a12869371 | |
| parent | a2afe790176edb6fe64723b8c04b8429e04a9802 (diff) | |
| download | couchdb-7b85048ec2566fe9b2eedabd51b992d5ac52b9a3.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 6fb42e425..cac648d05 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -159,7 +159,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-1"}}, +{ibrowse, "ibrowse", {tag, "CouchDB-4.4.2-2"}}, {jiffy, "jiffy", {tag, "CouchDB-1.0.5-1"}}, {mochiweb, "mochiweb", {tag, "v2.20.0"}}, {meck, "meck", {tag, "0.8.8"}}, diff --git a/src/couch_replicator/src/couch_replicator_connection.erl b/src/couch_replicator/src/couch_replicator_connection.erl index f31baf41d..d1c3d93fc 100644 --- a/src/couch_replicator/src/couch_replicator_connection.erl +++ b/src/couch_replicator/src/couch_replicator_connection.erl @@ -72,7 +72,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) -> |