summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Avdey <eiri@eiri.ca>2019-06-20 10:42:30 -0300
committerPaul J. Davis <paul.joseph.davis@gmail.com>2019-06-20 09:28:23 -0500
commit2cbc7f03082721a64dba9bb601bc5f894187ebff (patch)
treeaef963159cedd4f799e7658c1b9fe9b9c5a7c2f2
parentcc2d64d9d2d0610f5d72c4c8046882c0db6a1ee2 (diff)
downloadcouchdb-2cbc7f03082721a64dba9bb601bc5f894187ebff.tar.gz
Fix arity in changes timeout callback
-rw-r--r--src/chttpd/src/chttpd_auth_cache.erl2
-rw-r--r--src/chttpd/src/chttpd_changes.erl4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/chttpd/src/chttpd_auth_cache.erl b/src/chttpd/src/chttpd_auth_cache.erl
index d947fe62e..fc1ee62fa 100644
--- a/src/chttpd/src/chttpd_auth_cache.erl
+++ b/src/chttpd/src/chttpd_auth_cache.erl
@@ -176,7 +176,7 @@ changes_callback({change, {Change}}, _) ->
ets_lru:remove(?CACHE, UserName)
end,
{ok, couch_util:get_value(seq, Change)};
-changes_callback(timeout, Acc) ->
+changes_callback({timeout, _ResponseType}, Acc) ->
{ok, Acc};
changes_callback({error, _}, EndSeq) ->
exit({seq, EndSeq}).
diff --git a/src/chttpd/src/chttpd_changes.erl b/src/chttpd/src/chttpd_changes.erl
index d27bbade4..0e034828e 100644
--- a/src/chttpd/src/chttpd_changes.erl
+++ b/src/chttpd/src/chttpd_changes.erl
@@ -485,10 +485,10 @@ get_changes_timeout(Args, Callback) ->
end;
true ->
{DefaultTimeout,
- fun(UserAcc) -> {ok, Callback(timeout, ResponseType, UserAcc)} end};
+ fun(UserAcc) -> {ok, Callback({timeout, ResponseType}, UserAcc)} end};
_ ->
{lists:min([DefaultTimeout, Heartbeat]),
- fun(UserAcc) -> {ok, Callback(timeout, ResponseType, UserAcc)} end}
+ fun(UserAcc) -> {ok, Callback({timeout, ResponseType}, UserAcc)} end}
end.
start_sending_changes(Callback, UserAcc) ->