make couch_httpd a full couch application With this change, the HTTP API is now handled by its own erlang application and supervision. It also improved the way you can reload the configuration and the modules. Now upgrading a listener or its configuration is first removing it from the supervsion then start the new process with the new configuration. This behaviour is similar to the one you have in nginx.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/bf97776e Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/bf97776e Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/bf97776e Branch: refs/heads/1994-merge-rcouch Commit: bf97776e398f0cad7b2523160c03588902a5a48f Parents: 0aaa221 Author: benoitc <[email protected]> Authored: Sat Jan 11 11:20:27 2014 +0100 Committer: Paul J. Davis <[email protected]> Committed: Wed Feb 12 18:16:58 2014 -0600 ---------------------------------------------------------------------- test/02-httpc-pool.t | 1 + test/03-replication-compact.t | 3 ++- test/04-replication-large-atts.t | 3 ++- test/05-replication-many-leaves.t | 3 ++- test/06-doc-missing-stubs.t | 3 ++- test/07-use-checkpoints.t | 3 ++- 6 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/bf97776e/test/02-httpc-pool.t ---------------------------------------------------------------------- diff --git a/test/02-httpc-pool.t b/test/02-httpc-pool.t index aac2eb5..50f40db 100755 --- a/test/02-httpc-pool.t +++ b/test/02-httpc-pool.t @@ -30,6 +30,7 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), + couch_httpd_sup:start_link(), ibrowse:start(), test_pool_full(), http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/bf97776e/test/03-replication-compact.t ---------------------------------------------------------------------- diff --git a/test/03-replication-compact.t b/test/03-replication-compact.t index 801b173..d42049a 100755 --- a/test/03-replication-compact.t +++ b/test/03-replication-compact.t @@ -85,6 +85,7 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), + couch_httpd_sup:start_link(), couch_replicator_sup:start_link(), ibrowse:start(), @@ -440,7 +441,7 @@ maybe_pause(Parent, Counter) -> db_url(DbName) -> iolist_to_binary([ "http://";, couch_config:get("httpd", "bind_address", "127.0.0.1"), - ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)), + ":", integer_to_list(mochiweb_socket_server:get(couch_http, port)), "/", DbName ]). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/bf97776e/test/04-replication-large-atts.t ---------------------------------------------------------------------- diff --git a/test/04-replication-large-atts.t b/test/04-replication-large-atts.t index da927e9..eb750e6 100755 --- a/test/04-replication-large-atts.t +++ b/test/04-replication-large-atts.t @@ -66,6 +66,7 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), + couch_httpd_sup:start_link(), couch_replicator_sup:start_link(), application:start(ibrowse), @@ -232,7 +233,7 @@ att_decoded_md5(Att) -> db_url(DbName) -> iolist_to_binary([ "http://";, couch_config:get("httpd", "bind_address", "127.0.0.1"), - ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)), + ":", integer_to_list(mochiweb_socket_server:get(couch_http, port)), "/", DbName ]). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/bf97776e/test/05-replication-many-leaves.t ---------------------------------------------------------------------- diff --git a/test/05-replication-many-leaves.t b/test/05-replication-many-leaves.t index d10419f..5c2aa27 100755 --- a/test/05-replication-many-leaves.t +++ b/test/05-replication-many-leaves.t @@ -78,6 +78,7 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), + couch_httpd_sup:start_link(), couch_replicator_sup:start_link(), ibrowse:start(), @@ -259,7 +260,7 @@ add_attachments(SourceDb, [{DocId, RevList} | Rest], NumAtts, IdRevsAcc) -> db_url(DbName) -> iolist_to_binary([ "http://";, couch_config:get("httpd", "bind_address", "127.0.0.1"), - ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)), + ":", integer_to_list(mochiweb_socket_server:get(couch_http, port)), "/", DbName ]). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/bf97776e/test/06-doc-missing-stubs.t ---------------------------------------------------------------------- diff --git a/test/06-doc-missing-stubs.t b/test/06-doc-missing-stubs.t index cee19ca..2e37d59 100755 --- a/test/06-doc-missing-stubs.t +++ b/test/06-doc-missing-stubs.t @@ -70,6 +70,7 @@ main(_) -> % Test motivated by COUCHDB-1365. test() -> couch_server_sup:start_link(test_util:config_files()), + couch_httpd_sup:start_link(), couch_replicator_sup:start_link(), ibrowse:start(), @@ -268,7 +269,7 @@ att_decoded_md5(Att) -> db_url(DbName) -> iolist_to_binary([ "http://";, couch_config:get("httpd", "bind_address", "127.0.0.1"), - ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)), + ":", integer_to_list(mochiweb_socket_server:get(couch_http, port)), "/", DbName ]). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/bf97776e/test/07-use-checkpoints.t ---------------------------------------------------------------------- diff --git a/test/07-use-checkpoints.t b/test/07-use-checkpoints.t index af7ec44..1631328 100755 --- a/test/07-use-checkpoints.t +++ b/test/07-use-checkpoints.t @@ -94,6 +94,7 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), + couch_httpd_sup:start_link(), couch_replicator_sup:start_link(), ibrowse:start(), @@ -210,7 +211,7 @@ compare_dbs(#db{name = SourceName}, #db{name = TargetName}) -> db_url(DbName) -> iolist_to_binary([ "http://";, couch_config:get("httpd", "bind_address", "127.0.0.1"), - ":", integer_to_list(mochiweb_socket_server:get(couch_httpd, port)), + ":", integer_to_list(mochiweb_socket_server:get(couch_http, port)), "/", DbName ]).
