Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFAD2E4A1 for ; Thu, 6 Dec 2012 21:06:57 +0000 (UTC) Received: (qmail 75113 invoked by uid 500); 6 Dec 2012 21:06:56 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 74993 invoked by uid 500); 6 Dec 2012 21:06:56 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 73961 invoked by uid 99); 6 Dec 2012 21:06:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2012 21:06:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1C29581CC1C; Thu, 6 Dec 2012 21:06:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [25/27] git commit: Log problems opening database at ERROR level except for auto-created system dbs Message-Id: <20121206210655.1C29581CC1C@tyr.zones.apache.org> Date: Thu, 6 Dec 2012 21:06:55 +0000 (UTC) Log problems opening database at ERROR level except for auto-created system dbs Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/41667642 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/41667642 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/41667642 Branch: refs/heads/1597-update-erlang-oauth-1-3-0 Commit: 41667642f73fc19785bd18d6140a707c36544972 Parents: 2057b89 Author: Robert Newson Authored: Fri Mar 23 14:06:22 2012 +0000 Committer: Robert Newson Committed: Tue Nov 13 13:32:31 2012 +0000 ---------------------------------------------------------------------- .../src/couch_replicator_manager.erl | 2 +- src/couchdb/couch_auth_cache.erl | 2 +- src/couchdb/couch_db.erl | 2 +- src/couchdb/couch_file.erl | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/41667642/src/couch_replicator/src/couch_replicator_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator/src/couch_replicator_manager.erl b/src/couch_replicator/src/couch_replicator_manager.erl index 15d6255..fec44df 100644 --- a/src/couch_replicator/src/couch_replicator_manager.erl +++ b/src/couch_replicator/src/couch_replicator_manager.erl @@ -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 -> http://git-wip-us.apache.org/repos/asf/couchdb/blob/41667642/src/couchdb/couch_auth_cache.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl index f90a5be..42ccd44 100644 --- a/src/couchdb/couch_auth_cache.erl +++ b/src/couchdb/couch_auth_cache.erl @@ -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">>), http://git-wip-us.apache.org/repos/asf/couchdb/blob/41667642/src/couchdb/couch_db.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl index 81e97f2..96f6719 100644 --- a/src/couchdb/couch_db.erl +++ b/src/couchdb/couch_db.erl @@ -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), http://git-wip-us.apache.org/repos/asf/couchdb/blob/41667642/src/couchdb/couch_file.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl index e00b0f0..54ff693 100644 --- a/src/couchdb/couch_file.erl +++ b/src/couchdb/couch_file.erl @@ -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 ->