You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/13 04:10:04 UTC
[08/14] couch-httpd commit: updated refs/heads/1994-merge-rcouch to
d936233
couch_server_sup -> couch_sup
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/898bb1e5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/898bb1e5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/898bb1e5
Branch: refs/heads/1994-merge-rcouch
Commit: 898bb1e51e5ceff64ff1734d881360dcbe4e6b4e
Parents: 9f994a5
Author: benoitc <be...@apache.org>
Authored: Mon Jan 13 23:06:26 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Feb 12 21:05:52 2014 -0600
----------------------------------------------------------------------
src/couch_httpd.erl | 2 +-
src/couch_httpd_misc_handlers.erl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/898bb1e5/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index 8cef53f..7be8a2a 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -92,7 +92,7 @@ start_link(couch_https) ->
start_link(Name, Options) ->
% read config and register for configuration changes
- % just stop if one of the config settings change. couch_server_sup
+ % just stop if one of the config settings change. couch_sup
% will restart us and then we will pick up the new settings.
BindAddress = couch_config:get("httpd", "bind_address", any),
http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/898bb1e5/src/couch_httpd_misc_handlers.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_misc_handlers.erl b/src/couch_httpd_misc_handlers.erl
index 1999e5e..293ef00 100644
--- a/src/couch_httpd_misc_handlers.erl
+++ b/src/couch_httpd_misc_handlers.erl
@@ -98,7 +98,7 @@ handle_restart_req(#httpd{method='POST'}=Req) ->
couch_httpd:validate_ctype(Req, "application/json"),
ok = couch_httpd:verify_is_server_admin(Req),
Result = send_json(Req, 202, {[{ok, true}]}),
- couch_server_sup:restart_core_server(),
+ couch_sup:restart_core_server(),
Result;
handle_restart_req(Req) ->
send_method_not_allowed(Req, "POST").