summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-04-18 16:34:33 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-04-18 16:34:33 +0000
commit6adbab8f3fadda652844c8db7ca30d382ad0fa5a (patch)
tree693502ac139841cb71a1a5bf0ff48e7c603c5e3b
parent5442bdb4f36f6079c5e63b5ddd8486acd032e5ad (diff)
Fixes COUCHDB-311
Returns an _external error as a binary. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@766353 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--THANKS1
-rw-r--r--src/couchdb/couch_external_manager.erl4
2 files changed, 3 insertions, 2 deletions
diff --git a/THANKS b/THANKS
index 376dac73..81fe5866 100644
--- a/THANKS
+++ b/THANKS
@@ -25,5 +25,6 @@ suggesting improvements or submitting changes. Some of these people are:
* Eric Casteleijn <eric.casteleijn@canonical.com>
* Maarten Thibaut <mthibaut@cisco.com>
* Florian Ebeling <florian.ebeling@gmail.com>
+ * Volker Mische <volker.mische@gmail.com>
For a list of authors see the `AUTHORS` file.
diff --git a/src/couchdb/couch_external_manager.erl b/src/couchdb/couch_external_manager.erl
index 230a9b27..034e0c50 100644
--- a/src/couchdb/couch_external_manager.erl
+++ b/src/couchdb/couch_external_manager.erl
@@ -53,9 +53,9 @@ handle_call({get, UrlName}, _From, Handlers) ->
[] ->
case couch_config:get("external", UrlName, nil) of
nil ->
- Mesg = lists:flatten(
+ Msg = lists:flatten(
io_lib:format("No server configured for ~p.", [UrlName])),
- {reply, {error, {unknown_external_server, Mesg}}, Handlers};
+ {reply, {error, {unknown_external_server, ?l2b(Msg)}}, Handlers};
Command ->
{ok, NewPid} = couch_external_server:start_link(UrlName, Command),
true = ets:insert(Handlers, {UrlName, NewPid}),