diff options
| author | Eric Avdey <eiri@eiri.ca> | 2019-10-29 21:37:25 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 21:37:25 -0300 |
| commit | 5e3e50f2424d09dc2086941dba7f0e13af6e4281 (patch) | |
| tree | 0e365a21d96eb0b201cfb0813073806d0548bfdb | |
| parent | 692f6025567f8fab586b26fef446ba0b8a698f94 (diff) | |
| parent | 30d4e9535ff5a20931267a6c5bbdbae828a0e00a (diff) | |
| download | couchdb-5e3e50f2424d09dc2086941dba7f0e13af6e4281.tar.gz | |
Merge pull request #2287 from apache/fix-all_docs-timeout-error
Pass timeout as an error to callback in `fabric_view_all_docs`
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | src/fabric/src/fabric_view_all_docs.erl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 4af915ee9..f28dcf77b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ addons: - libmozjs185-dev - pkg-config - python3.6 + - python3.6-dev - python3.6-venv - python3-requests - python3-sphinx diff --git a/src/fabric/src/fabric_view_all_docs.erl b/src/fabric/src/fabric_view_all_docs.erl index 5fe143731..07cd1b180 100644 --- a/src/fabric/src/fabric_view_all_docs.erl +++ b/src/fabric/src/fabric_view_all_docs.erl @@ -111,12 +111,12 @@ go(DbName, Options, QueryArgs, Callback, Acc0) -> {ok, Acc2} -> Callback(complete, Acc2); timeout -> - Callback(timeout, Acc0) + Callback({error, timeout}, Acc0) end; {'DOWN', Ref, _, _, Error} -> Callback({error, Error}, Acc0) after Timeout -> - Callback(timeout, Acc0) + Callback({error, timeout}, Acc0) end. go(DbName, _Options, Workers, QueryArgs, Callback, Acc0) -> |