Permalink
Browse files

Log problems opening database at ERROR level except for auto-created …

…system dbs
  • Loading branch information...
rnewson committed Mar 23, 2012
1 parent 2057b89 commit 41667642f73fc19785bd18d6140a707c36544972
@@ -579,7 +579,7 @@ zone(Hr, Min) ->
ensure_rep_db_exists() ->
DbName = ?l2b(couch_config:get("replicator", "db", "_replicator")),
UserCtx = #user_ctx{roles = [<<"_admin">>, <<"_replicator">>]},
- case couch_db:open_int(DbName, [sys_db, {user_ctx, UserCtx}]) of
+ case couch_db:open_int(DbName, [sys_db, {user_ctx, UserCtx}, nologifmissing]) of
{ok, Db} ->
Db;
_Error ->
@@ -386,7 +386,7 @@ get_user_props_from_db(UserName) ->
).
ensure_users_db_exists(DbName, Options) ->
- Options1 = [{user_ctx, #user_ctx{roles=[<<"_admin">>]}} | Options],
+ Options1 = [{user_ctx, #user_ctx{roles=[<<"_admin">>]}}, nologifmissing | Options],
case couch_db:open(DbName, Options1) of
{ok, Db} ->
ensure_auth_ddoc_exists(Db, <<"_design/_auth">>),
View
@@ -51,7 +51,7 @@ open_db_file(Filepath, Options) ->
{error, enoent} ->
% couldn't find file. is there a compact version? This can happen if
% crashed during the file switch.
- case couch_file:open(Filepath ++ ".compact") of
+ case couch_file:open(Filepath ++ ".compact", [nologifmissing]) of
{ok, Fd} ->
?LOG_INFO("Found ~s~s compaction file, using as primary storage.", [Filepath, ".compact"]),
ok = file:rename(Filepath ++ ".compact", Filepath),
@@ -58,8 +58,12 @@ open(Filepath, Options) ->
{trap_exit, true} -> receive {'EXIT', Pid, _} -> ok end;
{trap_exit, false} -> ok
end,
- ?LOG_DEBUG("Could not open file ~s: ~s",
- [Filepath, file:format_error(Reason)]),
+ case {lists:member(nologifmissing, Options), Reason} of
+ {true, enoent} -> ok;
+ _ ->
+ ?LOG_ERROR("Could not open file ~s: ~s",
+ [Filepath, file:format_error(Reason)])
+ end,
Error
end;
Error ->

0 comments on commit 4166764

Please sign in to comment.