diff options
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/templates/extended_bin.dtl | 11 | ||||
| -rw-r--r-- | priv/templates/nodetool.dtl | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl index bfdc132..8bb3b48 100644 --- a/priv/templates/extended_bin.dtl +++ b/priv/templates/extended_bin.dtl @@ -32,9 +32,12 @@ relx_rem_sh() { # transparently id="remsh$(relx_gen_id)-${NAME}" + # Get the node's ticktime so that we use the same thing. + TICKTIME="$(relx_nodetool rpcterms net_kernel get_net_ticktime)" + # Setup remote shell command to control node exec "$BINDIR/erl" "$NAME_TYPE" "$id" -remsh "$NAME" -boot start_clean \ - -setcookie "$COOKIE" + -setcookie "$COOKIE" -kernel net_ticktime $TICKTIME } # Generate a random id @@ -46,7 +49,7 @@ relx_gen_id() { relx_nodetool() { command="$1"; shift "$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \ - -setcookie "$COOKIE" "$command" + -setcookie "$COOKIE" "$command" $@ } # Output a start command for the last argument of run_erl @@ -140,6 +143,8 @@ case "$1" in # echo "Node is already running!" # exit 1 #fi + # Save this for later. + CMD=$1 case "$1" in start) shift @@ -159,7 +164,7 @@ case "$1" in [ "$RUN_PARAM" ] && set -- "$@" "$RUN_PARAM" # Export the HEART_COMMAND - HEART_COMMAND="$@" + HEART_COMMAND="$RELEASE_ROOT_DIR/bin/$REL_NAME $CMD" export HEART_COMMAND mkdir -p "$PIPE_DIR" diff --git a/priv/templates/nodetool.dtl b/priv/templates/nodetool.dtl index 80f1965..2f46395 100644 --- a/priv/templates/nodetool.dtl +++ b/priv/templates/nodetool.dtl @@ -42,7 +42,7 @@ main(Args) -> _ -> halt(1) end; - ["rpcterms", Module, Function, ArgsAsString] -> + ["rpcterms", Module, Function | ArgsAsString] -> case rpc:call(TargetNode, list_to_atom(Module), list_to_atom(Function), consult(ArgsAsString), 60000) of {badrpc, Reason} -> |