summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_server.erl
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-06-02 12:54:49 +0000
committerJan Lehnardt <jan@apache.org>2010-06-02 12:54:49 +0000
commit7fe84eba9982ebb3bcaa48b7aa28fdd2e130422d (patch)
tree4f32e7871f04faa9d8920a995d77f846736da73b /src/couchdb/couch_server.erl
parentd2a1c286cb7a7164e09a5032562bc206562efb7e (diff)
trailing whitespace pedantry
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@950545 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_server.erl')
-rw-r--r--src/couchdb/couch_server.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 081babd1..f2403ef7 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -108,7 +108,7 @@ hash_admin_passwords(Persist) ->
({User, ClearPassword}) ->
Salt = ?b2l(couch_uuids:random()),
Hashed = couch_util:to_hex(crypto:sha(ClearPassword ++ Salt)),
- couch_config:set("admins",
+ couch_config:set("admins",
User, "-hashed-" ++ Hashed ++ "," ++ Salt, Persist)
end, couch_config:get("admins")).
@@ -148,7 +148,7 @@ init([]) ->
start_time=httpd_util:rfc1123_date()}}.
terminate(_Reason, _Srv) ->
- [couch_util:shutdown_sync(Pid) || {_, {Pid, _LruTime}} <-
+ [couch_util:shutdown_sync(Pid) || {_, {Pid, _LruTime}} <-
ets:tab2list(couch_dbs_by_name)],
ok.
@@ -232,7 +232,7 @@ handle_call({open_result, DbName, {ok, OpenedDbPid}}, _From, Server) ->
link(OpenedDbPid),
[{DbName, {opening,Opener,Froms}}] = ets:lookup(couch_dbs_by_name, DbName),
lists:foreach(fun({FromPid,_}=From) ->
- gen_server:reply(From,
+ gen_server:reply(From,
catch couch_db:open_ref_counted(OpenedDbPid, FromPid))
end, Froms),
LruTime = now(),
@@ -242,11 +242,11 @@ handle_call({open_result, DbName, {ok, OpenedDbPid}}, _From, Server) ->
true = ets:insert(couch_dbs_by_pid, {OpenedDbPid, DbName}),
true = ets:insert(couch_dbs_by_lru, {LruTime, DbName}),
{reply, ok, Server};
-handle_call({open_result, DbName, Error}, _From, Server) ->
+handle_call({open_result, DbName, Error}, _From, Server) ->
[{DbName, {opening,Opener,Froms}}] = ets:lookup(couch_dbs_by_name, DbName),
lists:foreach(fun(From) ->
gen_server:reply(From, Error)
- end, Froms),
+ end, Froms),
true = ets:delete(couch_dbs_by_name, DbName),
true = ets:delete(couch_dbs_by_pid, Opener),
{reply, ok, Server#server{dbs_open=Server#server.dbs_open - 1}};