From df91169512b864c0fe66f746546aa5097b5256b3 Mon Sep 17 00:00:00 2001 From: Hunter Morgan Date: Mon, 29 Aug 2016 09:55:49 -0400 Subject: [PATCH] NIFI-2689 - improve foreground run mode of nifi * add exec to RUN_NIFI_CMD * remove subshell for else * tested compatible with runit with these changes This closes #966. Signed-off-by: Aldrin Piri --- .../nifi-resources/src/main/resources/bin/nifi.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh index c6336f63c3..9a7d2a9402 100755 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh @@ -290,12 +290,12 @@ run() { BOOTSTRAP_DIR_PARAMS="${BOOTSTRAP_LOG_PARAMS} ${BOOTSTRAP_PID_PARAMS} ${BOOTSTRAP_CONF_PARAMS}" - RUN_NIFI_CMD="cd "\""${NIFI_HOME}"\"" && ${sudo_cmd_prefix} "\""${JAVA}"\"" -cp "\""${BOOTSTRAP_CLASSPATH}"\"" -Xms12m -Xmx24m ${BOOTSTRAP_DIR_PARAMS} org.apache.nifi.bootstrap.RunNiFi" + RUN_NIFI_CMD="cd "\""${NIFI_HOME}"\"" && exec ${sudo_cmd_prefix} "\""${JAVA}"\"" -cp "\""${BOOTSTRAP_CLASSPATH}"\"" -Xms12m -Xmx24m ${BOOTSTRAP_DIR_PARAMS} org.apache.nifi.bootstrap.RunNiFi" if [ "$1" = "start" ]; then (eval $RUN_NIFI_CMD $@ &) else - (eval $RUN_NIFI_CMD $@) + eval $RUN_NIFI_CMD $@ fi EXIT_STATUS=$?