Permalink
Browse files

Move PB settings to riak_api and enable in the rel.

  • Loading branch information...
seancribbs committed May 10, 2012
1 parent 698551d commit 487dcc2c235b1dbe36f980babdee499d9bf44822
Showing with 22 additions and 17 deletions.
  1. +18 −15 rel/files/app.config
  2. +4 −2 rel/reltool.config
View
@@ -1,6 +1,24 @@
%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
%% ex: ft=erlang ts=4 sw=4 et
[
+ %% Riak Client APIs config
+ {riak_api, [
+ %% pb_backlog is the maximum length to which the queue of pending
+ %% connections may grow. If set, it must be an integer >= 0.
+ %% By default the value is 5. If you anticipate a huge number of
+ %% connections being initialised *simultaneously*, set this number
+ %% higher.
+ %% {pb_backlog, 64},
+
+ %% pb_ip is the IP address that the Riak Protocol Buffers interface
+ %% will bind to. If this is undefined, the interface will not run.
+ {pb_ip, "{{pb_ip}}" },
+
+ %% pb_port is the TCP port that the Riak Protocol Buffers interface
+ %% will bind to
+ {pb_port, {{pb_port}} }
+ ]},
+
%% Riak Core config
{riak_core, [
%% Default location of ringstate
@@ -49,21 +67,6 @@
%% mechanism that will be used on this node.
{storage_backend, riak_kv_bitcask_backend},
- %% pb_ip is the IP address that the Riak Protocol Buffers interface
- %% will bind to. If this is undefined, the interface will not run.
- {pb_ip, "{{pb_ip}}" },
-
- %% pb_port is the TCP port that the Riak Protocol Buffers interface
- %% will bind to
- {pb_port, {{pb_port}} },
-
- %% pb_backlog is the maximum length to which the queue of pending
- %% connections may grow. If set, it must be an integer >= 0.
- %% By default the value is 5. If you anticipate a huge number of
- %% connections being initialised *simultaneously*, set this number
- %% higher.
- %% {pb_backlog, 64},
-
%% raw_name is the first part of all URLS used by the Riak raw HTTP
%% interface. See riak_web.erl and raw_http_resource.erl for
%% details.
View
@@ -26,7 +26,8 @@
cluster_info,
lager,
basho_metrics,
- riak_control
+ riak_control,
+ riak_api
]},
{rel, "start_clean", "",
[
@@ -51,7 +52,8 @@
{app, sasl, [{incl_cond, include}]},
{app, lager, [{incl_cond, include}]},
{app, basho_metrics, [{incl_cond, include}]},
- {app, riak_control, [{incl_cond, include}]}
+ {app, riak_control, [{incl_cond, include}]},
+ {app, riak_api, [{incl_cond, include}]}
]}.

0 comments on commit 487dcc2

Please sign in to comment.