summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_external_manager.erl
diff options
context:
space:
mode:
authorJohn Christopher Anderson <jchris@apache.org>2008-12-29 23:43:10 +0000
committerJohn Christopher Anderson <jchris@apache.org>2008-12-29 23:43:10 +0000
commit0eaf109d9d2c5bbda4a33d7c106c3a9f06f52d2a (patch)
tree759167072f99606fe082864c1ffe5068dae0e4f3 /src/couchdb/couch_external_manager.erl
parent46874e0e90a46fefe0a6f7e1ef574bb6a2fcaf78 (diff)
merge form branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@730016 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_external_manager.erl')
-rw-r--r--src/couchdb/couch_external_manager.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/couchdb/couch_external_manager.erl b/src/couchdb/couch_external_manager.erl
index d86013eb..9bcef57b 100644
--- a/src/couchdb/couch_external_manager.erl
+++ b/src/couchdb/couch_external_manager.erl
@@ -13,7 +13,7 @@
-module(couch_external_manager).
-behaviour(gen_server).
--export([start_link/0, execute/8, config_change/2]).
+-export([start_link/0, execute/2, config_change/2]).
-export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2]).
-include("couch_db.hrl").
@@ -21,13 +21,13 @@
start_link() ->
gen_server:start_link({local, couch_external_manager}, couch_external_manager, [], []).
-execute(UrlName, Db, Verb, Path, Query, Body, Post, Cookie) ->
+execute(UrlName, JsonReq) ->
Pid = gen_server:call(couch_external_manager, {get, UrlName}),
case Pid of
{error, Reason} ->
Reason;
_ ->
- couch_external_server:execute(Pid, Db, Verb, Path, Query, Body, Post, Cookie)
+ couch_external_server:execute(Pid, JsonReq)
end.
config_change("external", UrlName) ->