Skip to content

Commit

Permalink
wrapper comments and new relic move
Browse files Browse the repository at this point in the history
  • Loading branch information
Amos Wood committed Aug 5, 2014
1 parent 74cc5e3 commit 31b9349
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions templates/neo4j-wrapper.conf.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#********************************************************************
# Managed by puppet - Any changes will be overwritten
#********************************************************************

wrapper.java.additional=-Dorg.neo4j.server.properties=conf/neo4j-server.properties
wrapper.java.additional=-Djava.util.logging.config.file=conf/logging.properties
wrapper.java.additional=-Dlog4j.configuration=file:conf/log4j.properties
Expand All @@ -8,6 +12,9 @@ wrapper.java.additional=-Dlog4j.configuration=file:conf/log4j.properties

wrapper.java.additional=-XX:+UseConcMarkSweepGC
wrapper.java.additional=-XX:+CMSClassUnloadingEnabled
<% if @newrelic_jar_path -%>
wrapper.java.additional=-javaagent:<%= @newrelic_jar_path %>
<% end -%>

# Java Heap Size: by default the Java heap size is dynamically
# calculated based on available system resources.
Expand Down Expand Up @@ -37,11 +44,3 @@ wrapper.pidfile=<%= @install_prefix -%>/data/neo4j-server.pid
# Name of the service
wrapper.name=neo4j
wrapper.user=neo4j

#********************************************************************
# New Relic Java Agent
#********************************************************************

<% if @newrelic_jar_path -%>
wrapper.java.additional=-javaagent:<%= @newrelic_jar_path %>
<% end -%>

0 comments on commit 31b9349

Please sign in to comment.