couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cml...@apache.org
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 GMT
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
     [] ->



Mime
View raw message