Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B12709FED for ; Mon, 3 Oct 2011 06:00:00 +0000 (UTC) Received: (qmail 97220 invoked by uid 500); 3 Oct 2011 06:00:00 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 97163 invoked by uid 500); 3 Oct 2011 05:59:59 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 97075 invoked by uid 99); 3 Oct 2011 05:59:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2011 05:59:56 +0000 X-ASF-Spam-Status: No, hits=-2000.5 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.116] (HELO hel.zones.apache.org) (140.211.11.116) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Oct 2011 05:59:54 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [140.211.11.116]) by hel.zones.apache.org (Postfix) with ESMTP id 0A0AF2A56E0 for ; Mon, 3 Oct 2011 05:59:34 +0000 (UTC) Date: Mon, 3 Oct 2011 05:59:34 +0000 (UTC) From: "Benoit Chesneau (Commented) (JIRA)" To: dev@couchdb.apache.org Message-ID: <1882217994.2041.1317621574042.JavaMail.tomcat@hel.zones.apache.org> In-Reply-To: <672355240.31521.1316106489039.JavaMail.tomcat@hel.zones.apache.org> Subject: [jira] [Commented] (COUCHDB-1285) Allow configuration of vendor and module version in the welcome message MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/COUCHDB-1285?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13119146#comment-13119146 ] Benoit Chesneau commented on COUCHDB-1285: ------------------------------------------ yes. that's better indeed. One thing though that isn't soved yet is how to register these modules ? > Allow configuration of vendor and module version in the welcome message > ----------------------------------------------------------------------- > > Key: COUCHDB-1285 > URL: https://issues.apache.org/jira/browse/COUCHDB-1285 > Project: CouchDB > Issue Type: Improvement > Reporter: Jan Lehnardt > Attachments: vendor_and_modules_objects.patch > > > The patch below allows to configure vendor and module version information into the GET / welcome message. > E.g. > [vendor] > name = refuge > version = 2.0.0 > > [modules] > geocouch = 1.2.1 > would produce: > {"couchdb":"Welcome","version":"1.2.0","refuge":"2.0.0","modules":{"geocouch":"1.2.1"}} > -- > --- a/src/couchdb/couch_httpd_misc_handlers.erl > +++ b/src/couchdb/couch_httpd_misc_handlers.erl > @@ -30,9 +30,23 @@ > % httpd global handlers > > handle_welcome_req(#httpd{method='GET'}=Req, WelcomeMessage) -> > + Vendor = case couch_config:get("vendor") of > + [] -> []; > + Vendor1 -> [{ > + proplists:get_value("name", Vendor1), > + ?l2b(proplists:get_value("version", Vendor1)) > + }] > + end, > + > + Modules = lists:map(fun({Key, Value}) -> > + {Key, ?l2b(Value)} > + end, couch_config:get("modules")), > + > send_json(Req, {[ > {couchdb, WelcomeMessage}, > - {version, list_to_binary(couch_server:get_version())} > + {version, list_to_binary(couch_server:get_version())}] > + ++ Vendor > + ++ [{modules, {Modules}} > ]}); > handle_welcome_req(Req, _) -> > send_method_not_allowed(Req, "GET,HEAD"). > -- -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira