brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [2/3] brooklyn-dist git commit: Fix brooklyn.service: include JAVA_OPTS
Date Mon, 21 Mar 2016 10:21:36 GMT
Fix brooklyn.service: include JAVA_OPTS

Note the careful use of $JAVA_OPTS rather than ${JAVA_OPTS} so that 
it is passed as multiple command line options, rather than one.

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/8cbed0d8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/8cbed0d8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/8cbed0d8

Branch: refs/heads/master
Commit: 8cbed0d8047881a51b4187f1120c4f4249187684
Parents: f1cd94a
Author: Aled Sage <aled.sage@gmail.com>
Authored: Fri Mar 18 23:14:36 2016 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Sat Mar 19 00:00:55 2016 +0000

----------------------------------------------------------------------
 packaging/src/service/brooklyn.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8cbed0d8/packaging/src/service/brooklyn.service
----------------------------------------------------------------------
diff --git a/packaging/src/service/brooklyn.service b/packaging/src/service/brooklyn.service
index 825d22d..5986555 100644
--- a/packaging/src/service/brooklyn.service
+++ b/packaging/src/service/brooklyn.service
@@ -24,7 +24,7 @@ Type=simple
 WorkingDirectory=/opt/brooklyn/
 Environment="JAVA_OPTS=-Dbrooklyn.location.localhost.address=127.0.0.1 -Dlogback.configurationFile=/etc/brooklyn/logback.xml
-Xms256m -Xmx1g -XX:MaxPermSize=256m"
 Environment="CLASSPATH=/opt/brooklyn/conf:/opt/brooklyn/lib/patch/*:/opt/brooklyn/lib/brooklyn/*:/opt/brooklyn/lib/dropins/*"
-ExecStart=/usr/bin/java org.apache.brooklyn.cli.Main launch --noGlobalBrooklynProperties
--localBrooklynProperties /etc/brooklyn/brooklyn.conf --persist auto
+ExecStart=/usr/bin/java $JAVA_OPTS -cp "$CLASSPATH" org.apache.brooklyn.cli.Main launch --noGlobalBrooklynProperties
--localBrooklynProperties /etc/brooklyn/brooklyn.conf --persist auto
 Restart=always
 User=brooklyn
 Group=brooklyn


Mime
View raw message