You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by ja...@apache.org on 2014/03/24 20:56:21 UTC
git commit: FLUME-2347: Add FLUME_JAVA_OPTS which allows users to
inject java properties from cmd line
Repository: flume
Updated Branches:
refs/heads/trunk e12f0a7a4 -> 09f0a5136
FLUME-2347: Add FLUME_JAVA_OPTS which allows users to inject java properties from cmd line
(Brock Noland via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/09f0a513
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/09f0a513
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/09f0a513
Branch: refs/heads/trunk
Commit: 09f0a513602c3b0bb2c9e19903ae6d5e052ab460
Parents: e12f0a7
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Mon Mar 24 12:55:35 2014 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Mon Mar 24 12:55:35 2014 -0700
----------------------------------------------------------------------
bin/flume-ng | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/09f0a513/bin/flume-ng
----------------------------------------------------------------------
diff --git a/bin/flume-ng b/bin/flume-ng
index 3a8a10d..e09e26b 100755
--- a/bin/flume-ng
+++ b/bin/flume-ng
@@ -224,7 +224,7 @@ run_flume() {
if [ ${CLEAN_FLAG} -ne 0 ]; then
set -x
fi
- $EXEC $JAVA_HOME/bin/java $JAVA_OPTS "${arr_java_props[@]}" -cp "$FLUME_CLASSPATH" \
+ $EXEC $JAVA_HOME/bin/java $JAVA_OPTS $FLUME_JAVA_OPTS "${arr_java_props[@]}" -cp "$FLUME_CLASSPATH" \
-Djava.library.path=$FLUME_JAVA_LIBRARY_PATH "$FLUME_APPLICATION_CLASS" $*
}