Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 13619 invoked from network); 8 Nov 2010 22:14:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Nov 2010 22:14:19 -0000 Received: (qmail 91179 invoked by uid 500); 8 Nov 2010 22:14:51 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 91094 invoked by uid 500); 8 Nov 2010 22:14:50 -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 91087 invoked by uid 99); 8 Nov 2010 22:14:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Nov 2010 22:14:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 08 Nov 2010 22:14:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB7A02388A32; Mon, 8 Nov 2010 22:13:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1032764 - /couchdb/trunk/src/couchdb/couch_view_group.erl Date: Mon, 08 Nov 2010 22:13:33 -0000 To: commits@couchdb.apache.org From: kocolosk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101108221333.EB7A02388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kocolosk Date: Mon Nov 8 22:13:33 2010 New Revision: 1032764 URL: http://svn.apache.org/viewvc?rev=1032764&view=rev Log: shut down couch_view_group cleanly if no_db_file Modified: couchdb/trunk/src/couchdb/couch_view_group.erl Modified: couchdb/trunk/src/couchdb/couch_view_group.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_view_group.erl?rev=1032764&r1=1032763&r2=1032764&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_view_group.erl (original) +++ couchdb/trunk/src/couchdb/couch_view_group.erl Mon Nov 8 22:13:33 2010 @@ -77,7 +77,7 @@ start_link(InitArgs) -> % init creates a closure which spawns the appropriate view_updater. init({InitArgs, ReturnPid, Ref}) -> process_flag(trap_exit, true), - case prepare_group(InitArgs, false) of + try prepare_group(InitArgs, false) of {ok, #group{db=Db, fd=Fd, current_seq=Seq}=Group} -> case Seq > couch_db:get_update_seq(Db) of true -> @@ -95,6 +95,9 @@ init({InitArgs, ReturnPid, Ref}) -> Error -> ReturnPid ! {Ref, self(), Error}, ignore + catch exit:no_db_file -> + ReturnPid ! {Ref, self(), {error, no_db_file}}, + ignore end.