Author: fdmanana
Date: Sat Jan 8 11:58:29 2011
New Revision: 1056695
URL: http://svn.apache.org/viewvc?rev=1056695&view=rev
Log:
Merge revision 1056694 from trunk
Add missing case for COUCHDB-966
When not able to read one of the .ini configuration files due to file
permissions,
map {error, eacces} into {file_permission_error, Filepath} and throw that as an
exception.
Modified:
couchdb/branches/1.1.x/src/couchdb/couch_config.erl
Modified: couchdb/branches/1.1.x/src/couchdb/couch_config.erl
URL:
http://svn.apache.org/viewvc/couchdb/branches/1.1.x/src/couchdb/couch_config.erl?rev=1056695&r1=1056694&r2=1056695&view=diff
==============================================================================
--- couchdb/branches/1.1.x/src/couchdb/couch_config.erl (original)
+++ couchdb/branches/1.1.x/src/couchdb/couch_config.erl Sat Jan 8 11:58:29 2011
@@ -93,15 +93,19 @@ register(Fun, Pid) ->
init(IniFiles) ->
ets:new(?MODULE, [named_table, set, protected]),
- lists:map(fun(IniFile) ->
- {ok, ParsedIniValues} = parse_ini_file(IniFile),
- ets:insert(?MODULE, ParsedIniValues)
- end, IniFiles),
- WriteFile = case IniFiles of
- [_|_] -> lists:last(IniFiles);
- _ -> undefined
- end,
- {ok, #config{write_filename=WriteFile}}.
+ try
+ lists:map(fun(IniFile) ->
+ {ok, ParsedIniValues} = parse_ini_file(IniFile),
+ ets:insert(?MODULE, ParsedIniValues)
+ end, IniFiles),
+ WriteFile = case IniFiles of
+ [_|_] -> lists:last(IniFiles);
+ _ -> undefined
+ end,
+ {ok, #config{write_filename = WriteFile}}
+ catch _Tag:Error ->
+ {stop, Error}
+ end.
terminate(_Reason, _State) ->
@@ -183,6 +187,8 @@ parse_ini_file(IniFile) ->
case file:read_file(IniFilename) of
{ok, IniBin0} ->
IniBin0;
+ {error, eacces} ->
+ throw({file_permission_error, IniFile});
{error, enoent} ->
Fmt = "Couldn't find server configuration file ~s.",
Msg = ?l2b(io_lib:format(Fmt, [IniFilename])),
