Skip to content

erl scripts #1049

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
merged 2 commits into from
Jan 5, 2021
Merged

erl scripts #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58fc740
erl scripts
martinsumner Dec 30, 2020
d10ce11
Remove bespoke top formatter
martinsumner Dec 30, 2020
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
135 changes: 0 additions & 135 deletions apps/riak/src/etop_txt.erl
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/riak/src/riak.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
[{description, "The Riak Database"},
{vsn, "3.0"},
{registered, []},
{modules, [etop_txt]},
{applications, [
kernel,
stdlib,
Expand Down
1 change: 1 addition & 0 deletions rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
riak_sysmon,
os_mon,
crypto,
observer,
runtime_tools,
xmerl,
mochiweb,
Expand Down
10 changes: 10 additions & 0 deletions rel/files/riak-admin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ cd $RUNNER_BASE_DIR
# Identify the script name
SCRIPT="riak-admin"

# Setup required due to relx not node-package
ERTS_PATH=$BINDIR
NAME_PARAM="-name"
BOOT_FILE="start_clean"

usage() {
echo "Usage: $SCRIPT { cluster | join | leave | backup | restore | test | "
echo " reip | js-reload | erl-reload | wait-for-service | "
Expand Down Expand Up @@ -908,6 +913,7 @@ case "$1" in
NEWNODE=$2
$ERTS_PATH/erl -noshell \
-pa $RUNNER_LIB_DIR/basho-patches \
-boot $BOOT_FILE \
$CONFIG_ARGS \
-eval "riak_kv_console:$ACTION(['$OLDNODE', '$NEWNODE'])" \
-s init stop
Expand All @@ -928,6 +934,7 @@ case "$1" in

$ERTS_PATH/erl -noshell $NAME_PARAM riak_kv_backup$NAME_HOST -setcookie $COOKIE \
-pa $RUNNER_LIB_DIR/basho-patches \
-boot $BOOT_FILE \
-eval "riak_kv_backup:$ACTION('$NODE', \"$FILENAME\")" -s init stop
;;

Expand All @@ -947,6 +954,7 @@ case "$1" in

$ERTS_PATH/erl -noshell $NAME_PARAM riak_kv_backup$NAME_HOST -setcookie $COOKIE \
-pa $RUNNER_LIB_DIR/basho-patches \
-boot $BOOT_FILE \
-eval "riak_kv_backup:$ACTION('$NODE', \"$FILENAME\", \"$TYPE\")" -s init stop
;;

Expand All @@ -960,6 +968,7 @@ case "$1" in

$ERTS_PATH/erl -noshell $NAME_PARAM riak_test$NAME_HOST $COOKIE_ARG \
-pa $RUNNER_LIB_DIR/basho-patches \
-boot $BOOT_FILE \
-eval "case catch(riak:client_test(\"$NODE_NAME\")) of \
ok -> init:stop(); \
_ -> init:stop(1) \
Expand Down Expand Up @@ -995,6 +1004,7 @@ case "$1" in
# Using np_etop instead of riak_etop to follow node_package convention
$ERTS_PATH/erl -noshell -noinput \
-pa $RUNNER_LIB_DIR/basho-patches \
-boot $BOOT_FILE \
-hidden $NAME_PARAM np_etop$RAND$NAME_HOST $COOKIE_ARG \
-s etop -s erlang halt -output text \
-node $NODE_NAME \
Expand Down