summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-07-23 13:10:02 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-07-23 13:10:02 +0000
commitab21ceb1e8f2fff2ac4e3b4dcab17ef779e38e5f (patch)
treed886b1569ad3055a53c4e2067f884991dccde92b /src
parentb1243f897fe4ac5d0719bec464c14d00b72875d9 (diff)
Fixes error on first boot after adding an admin.
hash_admin_passwords() was being called after registering a config callback which caused couch_server to die when first booting. Just placed the first call before registering the callback. Thanks Bob Dionne. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@797055 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_server.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 1df951e6..ddee80ad 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -144,11 +144,11 @@ init([]) ->
gen_server:call(couch_server,
{set_max_dbs_open, list_to_integer(Max)})
end),
+ hash_admin_passwords(),
ok = couch_config:register(
fun("admins") ->
hash_admin_passwords()
end),
- hash_admin_passwords(),
{ok, RegExp} = regexp:parse("^[a-z][a-z0-9\\_\\$()\\+\\-\\/]*$"),
ets:new(couch_dbs_by_name, [set, private, named_table]),
ets:new(couch_dbs_by_pid, [set, private, named_table]),