Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 3084 invoked from network); 14 Jun 2010 14:29:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 14 Jun 2010 14:29:34 -0000 Received: (qmail 56475 invoked by uid 500); 14 Jun 2010 14:29:34 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 56394 invoked by uid 500); 14 Jun 2010 14:29:33 -0000 Mailing-List: contact commits-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 commits@couchdb.apache.org Received: (qmail 56387 invoked by uid 99); 14 Jun 2010 14:29:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jun 2010 14:29:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Jun 2010 14:29:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AF40523889B3; Mon, 14 Jun 2010 14:28:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r954483 - in /couchdb/branches/0.11.x: etc/couchdb/default.ini.tpl.in src/couchdb/couch_httpd.erl Date: Mon, 14 Jun 2010 14:28:39 -0000 To: commits@couchdb.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100614142839.AF40523889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jan Date: Mon Jun 14 14:28:39 2010 New Revision: 954483 URL: http://svn.apache.org/viewvc?rev=954483&view=rev Log: Merge from trunk: make max_concurrent_connections configurable via Randall Leeds / COUCHDB-705 Modified: couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl Modified: couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in?rev=954483&r1=954482&r2=954483&view=diff ============================================================================== --- couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in (original) +++ couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in Mon Jun 14 14:28:39 2010 @@ -15,6 +15,7 @@ delayed_commits = true ; set this to fal [httpd] port = 5984 bind_address = 127.0.0.1 +max_connections = 2048 authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler} default_handler = {couch_httpd_db, handle_request} secure_rewrites = true Modified: couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl?rev=954483&r1=954482&r2=954483&view=diff ============================================================================== --- couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl (original) +++ couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl Mon Jun 14 14:28:39 2010 @@ -35,6 +35,7 @@ start_link() -> BindAddress = couch_config:get("httpd", "bind_address", any), Port = couch_config:get("httpd", "port", "5984"), + MaxConnections = couch_config:get("httpd", "max_connections", "2048"), VirtualHosts = couch_config:get("vhosts"), DefaultSpec = "{couch_httpd_db, handle_request}", @@ -73,7 +74,8 @@ start_link() -> {loop, Loop}, {name, ?MODULE}, {ip, BindAddress}, - {port, Port} + {port, Port}, + {max, MaxConnections} ]) of {ok, MochiPid} -> {ok, MochiPid}; {error, Reason} -> @@ -86,6 +88,8 @@ start_link() -> ?MODULE:stop(); ("httpd", "port") -> ?MODULE:stop(); + ("httpd", "max_connections") -> + ?MODULE:stop(); ("httpd", "default_handler") -> ?MODULE:stop(); ("httpd_global_handlers", _) ->