diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | couchjs/c_src/SConscript | 5 | ||||
| -rw-r--r-- | rebar.config | 14 | ||||
| -rw-r--r-- | rel/overlay/etc/default.ini | 22 | ||||
| -rw-r--r-- | rel/reltool.config | 2 |
5 files changed, 22 insertions, 22 deletions
@@ -24,6 +24,7 @@ compile: clean: @echo "==> couchjs (clean)" @cd couchjs && python scons/scons.py --clean + @rm -rf couchjs/.sconf_temp couchjs/.sconsign.dblite @./rebar clean # compile is required here because of cross-dependencies between apps diff --git a/couchjs/c_src/SConscript b/couchjs/c_src/SConscript index a3e0cc07..4fc9e5a3 100644 --- a/couchjs/c_src/SConscript +++ b/couchjs/c_src/SConscript @@ -13,7 +13,6 @@ # the License. import os import commands -import subprocess def require_lib(name): if not conf.CheckLib(name): @@ -23,7 +22,7 @@ def require_lib(name): def runcmd(cmd): return commands.getstatusoutput(cmd) -env = Environment(CC="c++", CCFLAGS='-g -O2 -DXP_UNIX') +env = Environment(CCFLAGS='-g -O2 -DXP_UNIX') if os.uname()[0] == 'SunOS': env['CC'] = '/usr/sfw/bin/gcc' @@ -89,7 +88,7 @@ if not env.GetOption('clean'): ## Define properties for -h / -V - vsn = subprocess.check_output(["git","describe","--match","1.*"]) + (_, vsn) = runcmd("git describe --match 1.*") conf.Define("PACKAGE_STRING", '"%s"' % vsn.rstrip()) conf.Define("PACKAGE_NAME", '"Cloudant BigCouch"') conf.Define("PACKAGE_BUGREPORT", '"https://github.com/cloudant/bigcouch/issues"') diff --git a/rebar.config b/rebar.config index 6fb5113f..417ddb2f 100644 --- a/rebar.config +++ b/rebar.config @@ -14,19 +14,19 @@ {deps, [ {oauth, ".*", {git, "https://github.com/cloudant/erlang-oauth.git", - {branch, "couch"}}}, + {tag, "BigCouch-0.4.0"}}}, {ibrowse, ".*", {git, "https://github.com/cloudant/ibrowse.git", - {branch, "couch_1.1"}}}, + {tag, "CouchDB-1.1.0"}}}, {mochiweb, ".*", {git, "https://github.com/cloudant/mochiweb.git", - {branch, "couch_1.1"}}}, + {tag, "CouchDB-1.1.0"}}}, {rexi, ".*", {git, "https://github.com/cloudant/rexi.git", - master}}, + {tag, "1.5.5"}}}, {fabric, ".*", {git, "https://github.com/cloudant/fabric.git", - master}}, + {tag, "2.0.1"}}}, {mem3, ".*", {git, "https://github.com/cloudant/mem3.git", - master}}, + {tag, "2.0.0"}}}, {chttpd, ".*", {git, "https://github.com/cloudant/chttpd.git", - master}} + {tag, "1.4.0"}}} ]}. % needed for a clean transition to the deps model {clean_files, [ diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index 55371083..fdd11e14 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -7,16 +7,21 @@ max_dbs_open = 500 delayed_commits = false [cluster] -q=8 -r=2 -w=2 -n=3 +; Default number of shards for a new database +q = 8 +; Default number of copies of each shard +n = 3 [chttpd] port = {{cluster_port}} -backlog = 512 docroot = {{prefix}}/share/www +; Options for the MochiWeb HTTP server. +;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] + +; For more socket options, consult Erlang's module 'inet' man page. +;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] + [chttps] port = {{cluster_ssl}} @@ -41,16 +46,11 @@ ssl_certificate_max_depth = 1 [httpd] port = {{backend_port}} 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 vhost_global_handlers = _utils, _uuids, _session, _oauth, _users allow_jsonp = false -; Options for the MochiWeb HTTP server. -;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] -; For more socket options, consult Erlang's module 'inet' man page. -;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] log_max_chunk_size = 1000000 [ssl] @@ -73,7 +73,7 @@ javascript = {{prefix}}/bin/couchjs {{prefix}}/share/couchjs/main.js [query_server_config] reduce_limit = true -os_process_limit = 25 +os_process_soft_limit = 100 [daemons] view_manager={couch_view, start_link, []} diff --git a/rel/reltool.config b/rel/reltool.config index d8403865..6aa8735c 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -14,7 +14,7 @@ {sys, [ {lib_dirs, ["../apps", "../deps"]}, - {rel, "bigcouch", "0.4a", [ + {rel, "bigcouch", "0.4.0pre1", [ kernel, stdlib, sasl, |