diff options
author | Adam Kocoloski <kocolosk@apache.org> | 2009-08-30 17:56:56 +0000 |
---|---|---|
committer | Adam Kocoloski <kocolosk@apache.org> | 2009-08-30 17:56:56 +0000 |
commit | 6c5a22e7afd7530148f3eef6d4722cd725f28851 (patch) | |
tree | 80862f0920c1f7cb55e7279fd5acfbc27286194a /src/couchdb/couch_server.erl | |
parent | 422d815b3baf1a0152429d02257aeaeaf6fa471c (diff) |
refactor CouchDB startup procedure, see COUCHDB-216 for details
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@809392 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_server.erl')
-rw-r--r-- | src/couchdb/couch_server.erl | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl index 23de5284..93ba67d0 100644 --- a/src/couchdb/couch_server.erl +++ b/src/couchdb/couch_server.erl @@ -12,9 +12,7 @@ -module(couch_server). -behaviour(gen_server). --behaviour(application). --export([start/0,start/1,start/2,stop/0,stop/1,restart/0]). -export([open/2,create/2,delete/2,all_databases/0,get_version/0]). -export([init/1, handle_call/3,sup_start_link/0]). -export([handle_cast/2,code_change/3,handle_info/2,terminate/2]). @@ -30,29 +28,10 @@ start_time="" }). -start() -> - start(["default.ini"]). - -start(IniFiles) -> - couch_server_sup:start_link(IniFiles). - -start(_Type, _Args) -> - start(). - -restart() -> - stop(), - start(). - -stop() -> - couch_server_sup:stop(). - -stop(_Reason) -> - stop(). - dev_start() -> - stop(), + couch:stop(), up_to_date = make:all([load, debug_info]), - start(). + couch:start(). get_version() -> Apps = application:loaded_applications(), |