diff options
author | Eric Avdey <eiri@eiri.ca> | 2019-06-20 10:42:30 -0300 |
---|---|---|
committer | Paul J. Davis <paul.joseph.davis@gmail.com> | 2019-07-31 11:55:30 -0500 |
commit | 920e1ffbce2ba0b0fedb65cfabd334770016d0fe (patch) | |
tree | 3e544884df82610a0bbb48121f9b35885363e1cb | |
parent | d16cb1490e9f8aaefafebeb282103879a6d0230c (diff) | |
download | couchdb-920e1ffbce2ba0b0fedb65cfabd334770016d0fe.tar.gz |
Fix arity in changes timeout callback
-rw-r--r-- | src/chttpd/src/chttpd_auth_cache.erl | 2 | ||||
-rw-r--r-- | src/chttpd/src/chttpd_changes.erl | 4 |
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) -> |