Return-Path: Delivered-To: apmail-incubator-couchdb-commits-archive@locus.apache.org Received: (qmail 75451 invoked from network); 4 Apr 2008 20:53:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Apr 2008 20:53:37 -0000 Received: (qmail 47257 invoked by uid 500); 4 Apr 2008 20:53:38 -0000 Delivered-To: apmail-incubator-couchdb-commits-archive@incubator.apache.org Received: (qmail 47219 invoked by uid 500); 4 Apr 2008 20:53:38 -0000 Mailing-List: contact couchdb-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: couchdb-dev@incubator.apache.org Delivered-To: mailing list couchdb-commits@incubator.apache.org Received: (qmail 47210 invoked by uid 99); 4 Apr 2008 20:53:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 13:53:38 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 20:52:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6919F1A9832; Fri, 4 Apr 2008 13:53:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r644907 - in /incubator/couchdb/branches/mochiweb/src/couchdb: couch.app.tpl.in couch_rep.erl Date: Fri, 04 Apr 2008 20:53:12 -0000 To: couchdb-commits@incubator.apache.org From: cmlenz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080404205313.6919F1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cmlenz Date: Fri Apr 4 13:53:10 2008 New Revision: 644907 URL: http://svn.apache.org/viewvc?rev=644907&view=rev Log: mochiweb branch: Explicitly start the inets application in the replicator. Modified: incubator/couchdb/branches/mochiweb/src/couchdb/couch.app.tpl.in incubator/couchdb/branches/mochiweb/src/couchdb/couch_rep.erl Modified: incubator/couchdb/branches/mochiweb/src/couchdb/couch.app.tpl.in URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/mochiweb/src/couchdb/couch.app.tpl.in?rev=644907&r1=644906&r2=644907&view=diff ============================================================================== --- incubator/couchdb/branches/mochiweb/src/couchdb/couch.app.tpl.in (original) +++ incubator/couchdb/branches/mochiweb/src/couchdb/couch.app.tpl.in Fri Apr 4 13:53:10 2008 @@ -25,5 +25,4 @@ couch_view, couch_query_servers, couch_ft_query]}, - {applications,[kernel,stdlib,xmerl,mochiweb]}, - {mod,{couch_server,[]}}]}. + {applications,[kernel,stdlib,xmerl,inets,mochiweb]}]}. Modified: incubator/couchdb/branches/mochiweb/src/couchdb/couch_rep.erl URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/mochiweb/src/couchdb/couch_rep.erl?rev=644907&r1=644906&r2=644907&view=diff ============================================================================== --- incubator/couchdb/branches/mochiweb/src/couchdb/couch_rep.erl (original) +++ incubator/couchdb/branches/mochiweb/src/couchdb/couch_rep.erl Fri Apr 4 13:53:10 2008 @@ -163,6 +163,15 @@ couch_log:debug("couch_rep HTTP client request:"), couch_log:debug("\tAction: ~p", [Action]), couch_log:debug("\tUrl: ~p", [Url]), + + % ensure that the inets application is running + case application:start(inets) of + ok -> + ok; + {error, {already_started, inets}} -> + ok + end, + Request = case JsonBody of [] ->