summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2019-10-18 13:19:52 +0100
committerGitHub <noreply@github.com>2019-10-18 13:19:52 +0100
commit846783b19f0443b8b7495af9252d1539f20e146d (patch)
tree3891b64bc9a3df994bfc8ceb4b1ada50eaa01b06
parent5161e546c7c1ce7dea2bece4017c5da45ee52f61 (diff)
parent52fbbdfd92de2e277ecfebc10a641483c8d5b2ef (diff)
downloadcouchdb-846783b19f0443b8b7495af9252d1539f20e146d.tar.gz
Merge pull request #7 from apache/ken-query-servers-2
Always include 'query' as an allowed language
-rw-r--r--src/ken_server.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ken_server.erl b/src/ken_server.erl
index f082751c5..b33d01f35 100644
--- a/src/ken_server.erl
+++ b/src/ken_server.erl
@@ -527,7 +527,8 @@ prune_worker_table(State) ->
allowed_languages() ->
Config = couch_proc_manager:get_servers_from_env("COUCHDB_QUERY_SERVER_") ++
couch_proc_manager:get_servers_from_env("COUCHDB_NATIVE_QUERY_SERVER_"),
- [list_to_binary(string:to_lower(Lang)) || {Lang, _Cmd} <- Config].
+ Allowed = [list_to_binary(string:to_lower(Lang)) || {Lang, _Cmd} <- Config],
+ [<<"query">> | Allowed].
config(Key, Default) ->
config:get("ken", Key, Default).