diff options
| author | Damien F. Katz <damien@apache.org> | 2009-05-13 18:27:11 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2009-05-13 18:27:11 +0000 |
| commit | c044a331eda306bac2383aecb9996f987029dba0 (patch) | |
| tree | c0d180426d5c403829eaa4557cb6d80772c9ad26 /src/couchdb | |
| parent | 26694f7abd4a24a5dddc35de7af770da44923c91 (diff) | |
Adding testing for GET /_changes?continuous=true by adding a GET /_sleep?time=Msecs call, which allows the browser to process the waiting data on the other async XHR request.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@774474 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
| -rw-r--r-- | src/couchdb/couch_httpd_misc_handlers.erl | 8 | ||||
| -rw-r--r-- | src/couchdb/couch_query_servers.erl | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd_misc_handlers.erl b/src/couchdb/couch_httpd_misc_handlers.erl index 5daeeeea..36dfa0ac 100644 --- a/src/couchdb/couch_httpd_misc_handlers.erl +++ b/src/couchdb/couch_httpd_misc_handlers.erl @@ -15,7 +15,7 @@ -export([handle_welcome_req/2,handle_favicon_req/2,handle_utils_dir_req/2, handle_all_dbs_req/1,handle_replicate_req/1,handle_restart_req/1, handle_uuids_req/1,handle_config_req/1,handle_log_req/1, - handle_task_status_req/1]). + handle_task_status_req/1,handle_sleep_req/1]). -export([increment_update_seq_req/2]). @@ -56,6 +56,12 @@ handle_utils_dir_req(#httpd{method='GET'}=Req, DocumentRoot) -> handle_utils_dir_req(Req, _) -> send_method_not_allowed(Req, "GET,HEAD"). +handle_sleep_req(#httpd{method='GET'}=Req) -> + Time = list_to_integer(couch_httpd:qs_value(Req, "time")), + receive snicklefart -> ok after Time -> ok end, + send_json(Req, {[{ok, true}]}); +handle_sleep_req(Req) -> + send_method_not_allowed(Req, "GET,HEAD"). handle_all_dbs_req(#httpd{method='GET'}=Req) -> {ok, DbNames} = couch_server:all_databases(), diff --git a/src/couchdb/couch_query_servers.erl b/src/couchdb/couch_query_servers.erl index 734baade..7c82abe7 100644 --- a/src/couchdb/couch_query_servers.erl +++ b/src/couchdb/couch_query_servers.erl @@ -278,7 +278,7 @@ handle_info({'EXIT', Pid, Status}, {Langs, PidLangs, Pids, InUse}) -> [{Pid, Lang}] -> case Status of normal -> ok; - _ -> ?LOG_DEBUG("Linked process died abnromally: ~p (reason: ~p)", [Pid, Status]) + _ -> ?LOG_DEBUG("Linked process died abnormally: ~p (reason: ~p)", [Pid, Status]) end, {ok, { Langs, |