From 62bfad57a5907a2ba5bee2fb344fa9581bfde66c Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Tue, 7 Dec 2010 12:17:47 +0300 Subject: [PATCH 1/7] Allow for non-SMP emulator --- priv/templates/simplenode.runner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner index 72d951c..caae421 100755 --- a/priv/templates/simplenode.runner +++ b/priv/templates/simplenode.runner @@ -66,7 +66,7 @@ case "$1" in stop) # Wait for the node to completely stop... - PID=`ps -ef|grep "$RUNNER_BASE_DIR/.*/[b]eam.smp|awk '{print $2}'"` + PID=`ps -ef|grep "$RUNNER_BASE_DIR/.*/[b]eam|awk '{print $2}'"` $NODETOOL stop while `kill -0 $PID 2>/dev/null`; do From 4699a7c9c5464430e38acd5a9b8032547514d9cb Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Tue, 7 Dec 2010 12:18:06 +0300 Subject: [PATCH 2/7] Fix quotes --- priv/templates/simplenode.runner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner index caae421..46141bb 100755 --- a/priv/templates/simplenode.runner +++ b/priv/templates/simplenode.runner @@ -66,7 +66,7 @@ case "$1" in stop) # Wait for the node to completely stop... - PID=`ps -ef|grep "$RUNNER_BASE_DIR/.*/[b]eam|awk '{print $2}'"` + PID=`ps -ef|grep "$RUNNER_BASE_DIR/.*/[b]eam"|awk '{print $2}'` $NODETOOL stop while `kill -0 $PID 2>/dev/null`; do From d9f0cdeddd6e7499d3901e9f10f6126d0fc1cc54 Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Tue, 7 Dec 2010 12:21:54 +0300 Subject: [PATCH 3/7] ignore .eunit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 98df095..acf3c11 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ rebar .*.swp rt.work .hgignore +.eunit From 35a3391e7bfb671faae3b848869c63c72441fea6 Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Mon, 21 Feb 2011 12:46:57 +0300 Subject: [PATCH 4/7] Support passing plain arguments to simplenode. `init:get_plain_arguments()` returns `["console", "more_args"]` when started with `$APP_NAME console more_args`, but `["console"]` when started with `$APP_NAME start more_args`. This patch makes `start` behave like `console` in this respect. --- priv/templates/simplenode.runner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner index 18fa951..bcb8b94 100755 --- a/priv/templates/simplenode.runner +++ b/priv/templates/simplenode.runner @@ -62,7 +62,7 @@ case "$1" in HEART_COMMAND="$RUNNER_BASE_DIR/bin/$SCRIPT start" export HEART_COMMAND mkdir -p $PIPE_DIR - $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT console" 2>&1 + $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT ${*/start/console}" 2>&1 ;; stop) From 48d23b90acb688a68354b20a1b19fa0aa0e592be Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Mon, 21 Feb 2011 12:57:24 +0300 Subject: [PATCH 5/7] Add console_clean to usage message for simplenode. --- priv/templates/simplenode.runner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner index bcb8b94..09bb2d5 100755 --- a/priv/templates/simplenode.runner +++ b/priv/templates/simplenode.runner @@ -147,7 +147,7 @@ case "$1" in ;; *) - echo "Usage: $SCRIPT {start|stop|restart|reboot|ping|console|attach}" + echo "Usage: $SCRIPT {start|stop|restart|reboot|ping|console|console_clean|attach}" exit 1 ;; esac From 76a0fdffa7a01d19f589df37007dca0ce9db0261 Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Sat, 5 Mar 2011 14:16:41 +0300 Subject: [PATCH 6/7] Remove rejected commit --- priv/templates/simplenode.runner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner index 09bb2d5..43dce0f 100755 --- a/priv/templates/simplenode.runner +++ b/priv/templates/simplenode.runner @@ -62,7 +62,7 @@ case "$1" in HEART_COMMAND="$RUNNER_BASE_DIR/bin/$SCRIPT start" export HEART_COMMAND mkdir -p $PIPE_DIR - $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT ${*/start/console}" 2>&1 + $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT console" 2>&1 ;; stop) From 9da87854f2a8f61d0cedf588d482e78fe1af78e7 Mon Sep 17 00:00:00 2001 From: Alexey Romanov Date: Sat, 5 Mar 2011 14:27:07 +0300 Subject: [PATCH 7/7] Support passing plain arguments to `appname start` Currently with default simplenode template, `appname console other_args` will pass ["console", "other_args"] as plain arguments. But `appname start other_args` effectively calls `appname console`. This patch replaces this call with `appname console other_args`. --- priv/templates/simplenode.runner | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner index 43dce0f..a2cdd79 100755 --- a/priv/templates/simplenode.runner +++ b/priv/templates/simplenode.runner @@ -62,7 +62,8 @@ case "$1" in HEART_COMMAND="$RUNNER_BASE_DIR/bin/$SCRIPT start" export HEART_COMMAND mkdir -p $PIPE_DIR - $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT console" 2>&1 + shift # remove $1 + $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT console $@" 2>&1 ;; stop)