Repository: karaf Updated Branches: refs/heads/karaf-2.x a30861d46 -> 8d89ab1e4
[KARAF-3042] Add KARAF_REDIRECT variable to control if and where the std/err output are redirected Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8d89ab1e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8d89ab1e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8d89ab1e Branch: refs/heads/karaf-2.x Commit: 8d89ab1e4a204ebf6937ceb75c8dc08d9cff14fd Parents: a30861d Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Jul 23 22:07:05 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Jul 23 22:07:05 2014 +0200 ---------------------------------------------------------------------- .../src/main/distribution/unix-shell/bin/setenv | 2 +- .../src/main/distribution/unix-shell/bin/start | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8d89ab1e/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv index d4f2053..03c75ae 100755 --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv @@ -45,4 +45,4 @@ # export KARAF_BASE # Karaf base folder # export KARAF_ETC # Karaf etc folder # export KARAF_OPTS # Additional available Karaf options - +# export KARAF_REDIRECT # Enable/set the std/err redirection when using bin/start http://git-wip-us.apache.org/repos/asf/karaf/blob/8d89ab1e/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start index 6447327..baf9e74 100755 --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start @@ -108,6 +108,14 @@ locateEtc() { fi } +enableRedirect() { + if [ "x$KARAF_REDIRECT" != "x" ]; then + warn "Redirecting Karaf output to $KARAF_REDIRECT" + else + KARAF_REDIRECT="/dev/null" + fi +} + init() { # Determine if there is special OS handling we must perform detectOS @@ -123,6 +131,9 @@ init() { # Locate the Karaf etc directory locateEtc + + # Define the Karaf output redirection + enableRedirect } run() { @@ -137,7 +148,7 @@ run() { if [ ! -d "$KARAF_DATA/log" ]; then mkdir -p "$KARAF_DATA/log" fi - exec "$KARAF_HOME"/bin/karaf server "$@" >> "$KARAF_DATA/karaf.out" 2>&1 & + exec "$KARAF_HOME"/bin/karaf server "$@" >> "$KARAF_REDIRECT" 2>&1 & } main() {
