summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_server_sup.erl
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2008-04-20 22:27:11 +0000
committerDamien F. Katz <damien@apache.org>2008-04-20 22:27:11 +0000
commit7cbf6068b8214a89b75e3aa26bdb10d22e97ab90 (patch)
treeb9fe23fd3c699fd188fb29cc966864e7c730f9b3 /src/couchdb/couch_server_sup.erl
parentfb5b6bbc5aa941478d700e8fb3011c2a24c4d2d4 (diff)
Change uuid generaion to rely on crypto. Started crypto and inets application in startscript, and also couch_server_up. Fix for regression caused by accidental check-in of disabled etags.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@649988 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_server_sup.erl')
-rw-r--r--src/couchdb/couch_server_sup.erl5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl
index 9117f5f8..6fed6223 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/src/couchdb/couch_server_sup.erl
@@ -145,6 +145,11 @@ start_server(InputIniFilename) ->
io:format("couch ~s (LogLevel=~s)~n", [couch_server:get_version(), LogLevel]),
io:format("~s~n", [ConsoleStartupMsg]),
+
+
+ % ensure these applications are running
+ application:start(inets),
+ application:start(crypto),
process_flag(trap_exit, true),
StartResult = (catch supervisor:start_link(