svn commit: r797055 - /couchdb/trunk/src/couchdb/couch_server.erl

[da...@apache.org]

Author: davisp
Date: Thu Jul 23 13:10:02 2009
New Revision: 797055

URL: http://svn.apache.org/viewvc?rev=797055&view=rev
Log:
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.


Modified:
    couchdb/trunk/src/couchdb/couch_server.erl

Modified: couchdb/trunk/src/couchdb/couch_server.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_server.erl?rev=797055&r1=797054&r2=797055&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_server.erl (original)
+++ couchdb/trunk/src/couchdb/couch_server.erl Thu Jul 23 13:10:02 2009
@@ -144,11 +144,11 @@
             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]),