Repository: jena Updated Branches: refs/heads/master 1122fdfa0 -> 4c19d1262
Apply changes for FUSEKI_USER to both Fuseki1 and Fuseki2 service scripts. JENA-789 This closes #27 Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4c19d126 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4c19d126 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4c19d126 Branch: refs/heads/master Commit: 4c19d1262a32a6124d818cdbfad87a6e1b48363d Parents: 1122fdf Author: Andy Seaborne <[email protected]> Authored: Thu Feb 5 10:47:35 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Thu Feb 5 10:47:35 2015 +0000 ---------------------------------------------------------------------- jena-fuseki/fuseki | 15 ++++++++++++--- jena-fuseki2/apache-jena-fuseki/fuseki | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/4c19d126/jena-fuseki/fuseki ---------------------------------------------------------------------- diff --git a/jena-fuseki/fuseki b/jena-fuseki/fuseki index a4735a3..7b7b8d2 100755 --- a/jena-fuseki/fuseki +++ b/jena-fuseki/fuseki @@ -220,10 +220,15 @@ then fi fi +if [ ! -z "$FUSEKI_HOME" ] +then + FUSEKI_ADDITIONAL_ARGS=(--home "$FUSEKI_HOME") +fi + # Run command -RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$FUSEKI_START" $FUSEKI_ARGS) -RUN_CMD=("$JAVA" ${RUN_ARGS[@]}) +RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$FUSEKI_START" "${FUSEKI_ADDITIONAL_ARGS[@]}" $FUSEKI_ARGS) +RUN_CMD=("$JAVA" "${RUN_ARGS[@]}") ####################################### @@ -260,6 +265,10 @@ start() { # Make sure the data and log directories exist mkdir -p "$FUSEKI_DATA_DIR" mkdir -p "$FUSEKI_LOGS" + if [ ! -z "$FUSEKI_USER" ] + then + chown "$FUSEKI_USER" "$FUSEKI_DATA_DIR" "$FUSEKI_LOGS" + fi echo -n "Starting Fuseki: " if type start-stop-daemon > /dev/null 2>&1 @@ -294,7 +303,7 @@ start() { chown "$FUSEKI_USER" "$FUSEKI_PID" su - "$FUSEKI_USER" -c " echo 'Redirecting Fuseki stderr/stdout to $FUSEKI_LOGS_STDERROUT' - exec ${RUN_CMD[*]} & + exec ${RUN_CMD[*]} &> '$FUSEKI_LOGS_STDERROUT' & disown \$! echo \$! > '$FUSEKI_PID'" else http://git-wip-us.apache.org/repos/asf/jena/blob/4c19d126/jena-fuseki2/apache-jena-fuseki/fuseki ---------------------------------------------------------------------- diff --git a/jena-fuseki2/apache-jena-fuseki/fuseki b/jena-fuseki2/apache-jena-fuseki/fuseki old mode 100644 new mode 100755 index 9cc1fe8..ca17b4f --- a/jena-fuseki2/apache-jena-fuseki/fuseki +++ b/jena-fuseki2/apache-jena-fuseki/fuseki @@ -281,10 +281,15 @@ then fi fi +if [ ! -z "$FUSEKI_HOME" ] +then + FUSEKI_ADDITIONAL_ARGS=(--home "$FUSEKI_HOME") +fi + # Run command -RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$FUSEKI_START" $FUSEKI_ARGS) -RUN_CMD=("$JAVA" ${RUN_ARGS[@]}) +RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$FUSEKI_START" "${FUSEKI_ADDITIONAL_ARGS[@]}" $FUSEKI_ARGS) +RUN_CMD=("$JAVA" "${RUN_ARGS[@]}") ##################################################### @@ -318,6 +323,10 @@ start() { # Make sure the data and log directories exist mkdir -p "$FUSEKI_DATA_DIR" mkdir -p "$FUSEKI_LOGS" + if [ ! -z "$FUSEKI_USER" ] + then + chown "$FUSEKI_USER" "$FUSEKI_DATA_DIR" "$FUSEKI_LOGS" + fi # Make sure the .jar file exists if [ ! -e $FUSEKI_START ]; then @@ -364,7 +373,7 @@ start() { chown "$FUSEKI_USER" "$FUSEKI_PID" su - "$FUSEKI_USER" -c " log_daemon_msg "Redirecting Fuseki stderr/stdout to $FUSEKI_LOGS_STDERROUT" - exec ${RUN_CMD[*]} & + exec ${RUN_CMD[*]} &> '$FUSEKI_LOGS_STDERROUT' & disown \$! echo \$! > '$FUSEKI_PID'" else
