Skip to content

Support multiple PB listeners #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seancribbs merged 3 commits into from
Mar 16, 2013
Merged

Support multiple PB listeners #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23b4a87
Update the `pb` config check inline with latest riak_api code
russelldb Mar 15, 2013
4849d41
Update app.config for multiple PB listeners and tweak nodetool check.
Mar 15, 2013
e6a4a2c
get_env returns {ok, Term}, not Term
Mar 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions rel/files/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@
%% 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}} }

%% pb is a list of IP addresses and TCP ports that the Riak
%% Protocol Buffers interface will bind.
{pb, [ {"{{pb_ip}}", {{pb_port}} } ]}
]},

%% Riak Core config
Expand Down
6 changes: 3 additions & 3 deletions rel/files/nodetool
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ handoffport_exists(Terms) ->


pbc_port_exists(Terms) ->
case get_env(Terms, riak_api, pb_port) of
undefined ->
{warning, "pb_port undefined, protobuffs interface not enabled"};
case {get_env(Terms, riak_api, pb_port), get_env(Terms, riak_api, pb)} of
{undefined, PB} when PB == undefined orelse PB == {ok, []} ->
{warning, "pb settings undefined, protobuffs interface not enabled"};
_ ->
true
end.
Expand Down