You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/02/14 17:37:50 UTC
nifi git commit: NIFI-2689 - improve foreground run mode of nifi
Repository: nifi
Updated Branches:
refs/heads/master 0aa4b7267 -> df9116951
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 <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/df911695
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/df911695
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/df911695
Branch: refs/heads/master
Commit: df91169512b864c0fe66f746546aa5097b5256b3
Parents: 0aa4b72
Author: Hunter Morgan <au...@gmail.com>
Authored: Mon Aug 29 09:55:49 2016 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Tue Feb 14 12:37:31 2017 -0500
----------------------------------------------------------------------
.../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/df911695/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
----------------------------------------------------------------------
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 c6336f6..9a7d2a9 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=$?