Use an Array instead of a String to store jetty arguments.

tsz662 · May 10, 2013 · 89f30ce · 89f30ce
1 parent a2c823a
commit 89f30ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -21,7 +21,7 @@
 default['jetty']['home'] = '/usr/share/jetty'
 default['jetty']['port'] = 8080
 # The default arguments to pass to jetty.
-default['jetty']['args'] = ''
+default['jetty']['args'] = []
 default['jetty']['logs'] = '/var/log/jetty'
 # Extra options to pass to the JVM
 default['jetty']['java_options'] = []

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -41,7 +41,7 @@
 
 node.set['jetty']['download']  = "#{node['jetty']['directory']}/jetty-distribution-#{node['jetty']['version']}.tar.gz"
 node.set['jetty']['extracted'] = "#{node['jetty']['directory']}/jetty-distribution-#{node['jetty']['version']}"
-node.set['jetty']['args'] =  "#{node['jetty']['args']} -Djetty.port=#{node['jetty']['port']} -Djetty.logs=#{node['jetty']['logs']}"
+node.set['jetty']['args'] =  (node['jetty']['args'] + ["-Djetty.port=#{node['jetty']['port']}", "-Djetty.logs=#{node['jetty']['logs']}"]).uniq
 
 ################################################################################
 # Create user and group

diff --git a/templates/default/jetty.default.erb b/templates/default/jetty.default.erb
@@ -2,6 +2,6 @@ export JAVA_HOME=<%= node.java.java_home %>
 export JETTY_HOME=<%= node.jetty.home %>
 export JETTY_USER=<%= node.jetty.user %>
 export JETTY_PORT=<%= node.jetty.port %>
-export JETTY_ARGS="<%= node.jetty.args %>"
+export JETTY_ARGS="<%= node.jetty.args.join(' ') %>"
 export JAVA_OPTIONS="<%= node.jetty.java_options.kind_of?(Array) ?  node.jetty.java_options.join(' ') : node.jetty.java_options %>"
 export JETTY_LOGS="<%= node.jetty.logs %>"