You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2009/04/19 14:12:42 UTC
svn commit: r766456 - /couchdb/trunk/src/couchdb/couch_server_sup.erl
Author: jan
Date: Sun Apr 19 12:12:42 2009
New Revision: 766456
URL: http://svn.apache.org/viewvc?rev=766456&view=rev
Log:
whitespace
Modified:
couchdb/trunk/src/couchdb/couch_server_sup.erl
Modified: couchdb/trunk/src/couchdb/couch_server_sup.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server_sup.erl?rev=766456&r1=766455&r2=766456&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_server_sup.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server_sup.erl Sun Apr 19 12:12:42 2009
@@ -52,9 +52,9 @@
end;
_ -> ok
end,
-
+
{ok, ConfigPid} = couch_config:start_link(IniFiles),
-
+
LogLevel = couch_config:get("log", "level", "info"),
% announce startup
io:format("Apache CouchDB ~s (LogLevel=~s) is starting.~n", [
@@ -68,16 +68,16 @@
|| {{Module, Variable}, Value} <- couch_config:all()];
_ -> ok
end,
-
+
LibDir =
case couch_config:get("couchdb", "util_driver_dir", null) of
null ->
filename:join(code:priv_dir(couch), "lib");
LibDir0 -> LibDir0
end,
-
+
ok = couch_util:start_driver(LibDir),
-
+
BaseChildSpecs =
{{one_for_all, 10, 3600},
[{couch_config,
@@ -99,7 +99,6 @@
supervisor,
[couch_server_sup]}
]},
-
% ensure these applications are running
application:start(ibrowse),
@@ -117,11 +116,11 @@
("daemons", _) ->
?MODULE:stop()
end, Pid),
-
+
unlink(ConfigPid),
-
+
io:format("Apache CouchDB has started. Time to relax.~n"),
-
+
{ok, Pid}.
start_primary_services() ->
@@ -170,11 +169,11 @@
permanent,
brutal_kill,
worker,
- [Module]}
+ [Module]}
end
|| {Name, SpecStr}
<- couch_config:get("daemons"), SpecStr /= ""],
-
+
supervisor:start_link({local, couch_secondary_services}, couch_server_sup,
{{one_for_one, 10, 3600}, DaemonChildSpecs}).