Skip to content

Commit 8d775a8

Browse files
author
Andrei Zavada
committed
fix botched mass-rename in riak-admin
1 parent e5cc4a0 commit 8d775a8

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

rel/files/riak-admin

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
SCRIPT="riak-admin"
77

88
RPC_HOP="{{platform_bin_dir}}/riak rpc"
9+
RPCt_HOP="{{platform_bin_dir}}/riak rpcterms"
910

1011
ERTS_PATH="{{platform_base_dir}}/`(cd {{platform_base_dir}} && ls -d erts-*)`/bin"
1112
COOKIE=`egrep '^[ \t]*distributed_cookie[ \t]*=[ \t]*' {{platform_etc_dir}}/riak.conf 2> /dev/null | cut -d = -f 2 | tr -d ' '`
@@ -804,7 +805,7 @@ case "$1" in
804805
echo "Lists the services available on the node. See also: wait-for-service"
805806
exit 1
806807
fi
807-
$RPC_HOPterms riak_core_node_watcher services ''
808+
$RPCt_HOP riak_core_node_watcher services ''
808809
;;
809810

810811
wait[_-]for[_-]service)
@@ -818,7 +819,7 @@ case "$1" in
818819
while (true); do
819820
# Make sure riak_core_node_watcher is up and running locally before trying to query it
820821
# to avoid ugly (but harmless) error messages
821-
NODEWATCHER=`$RPC_HOPterms erlang whereis "'riak_core_node_watcher'."`
822+
NODEWATCHER=`$RPCt_HOP erlang whereis "'riak_core_node_watcher'."`
822823
if [ "$NODEWATCHER" = "undefined" ]; then
823824
echo "$SVC is not up: node watcher is not running"
824825
continue
@@ -827,9 +828,9 @@ case "$1" in
827828
# Get the list of services that are available on the requested node
828829
# If no node is specified, get the list of services from the local node
829830
if [ "X$TARGETNODE" = "X" ]; then
830-
SERVICES=`$RPC_HOPterms riak_core_node_watcher services ''`
831+
SERVICES=`$RPCt_HOP riak_core_node_watcher services ''`
831832
else
832-
SERVICES=`$RPC_HOPterms riak_core_node_watcher services "'${TARGETNODE}'."`
833+
SERVICES=`$RPCt_HOP riak_core_node_watcher services "'${TARGETNODE}'."`
833834
fi
834835
echo "$SERVICES" | grep "[[,]$SVC[],]" > /dev/null 2>&1
835836
if [ "X$?" = "X0" ]; then

0 commit comments

Comments
 (0)