Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 87445 invoked from network); 17 Feb 2011 21:06:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Feb 2011 21:06:59 -0000 Received: (qmail 63094 invoked by uid 500); 17 Feb 2011 21:06:59 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 62961 invoked by uid 500); 17 Feb 2011 21:06:58 -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 62954 invoked by uid 99); 17 Feb 2011 21:06:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Feb 2011 21:06:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Feb 2011 21:06:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 71AAB23889E5; Thu, 17 Feb 2011 21:06:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071790 - /couchdb/trunk/src/couchdb/couch_rep_db_listener.erl Date: Thu, 17 Feb 2011 21:06:35 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110217210635.71AAB23889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Thu Feb 17 21:06:35 2011 New Revision: 1071790 URL: http://svn.apache.org/viewvc?rev=1071790&view=rev Log: Replicator database: add document ID to log message Modified: couchdb/trunk/src/couchdb/couch_rep_db_listener.erl Modified: couchdb/trunk/src/couchdb/couch_rep_db_listener.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_db_listener.erl?rev=1071790&r1=1071789&r2=1071790&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_rep_db_listener.erl (original) +++ couchdb/trunk/src/couchdb/couch_rep_db_listener.erl Thu Feb 17 21:06:35 2011 @@ -320,13 +320,13 @@ keep_retrying(Server, Rep, Error, _Wait, ok = gen_server:call(Server, {restart_failure, Rep, Error}, infinity); keep_retrying(Server, #rep{doc = {RepProps}} = Rep, Error, Wait, RetriesLeft) -> - ?LOG_ERROR("Error starting replication `~s`: ~p. " - "Retrying in ~p seconds", [pp_rep_id(Rep), Error, Wait]), + DocId = get_value(<<"_id">>, RepProps), + ?LOG_ERROR("Error starting replication `~s` (document `~s`): ~p. " + "Retrying in ~p seconds", [pp_rep_id(Rep), DocId, Error, Wait]), ok = timer:sleep(Wait * 1000), case (catch couch_replicator:async_replicate(Rep)) of {ok, _} -> ok = gen_server:call(Server, {triggered, Rep#rep.id}, infinity), - DocId = get_value(<<"_id">>, RepProps), [{DocId, {RepId, MaxRetries}}] = ets:lookup(?DOC_ID_TO_REP_ID, DocId), ?LOG_INFO("Document `~s` triggered replication `~s` after ~p attempts", [DocId, pp_rep_id(RepId), MaxRetries - RetriesLeft + 1]);