ddollarGH-268 Updated generation of upstart scripts to encompensate f…

…or additional ports
padcom · Sep 26, 2012 · 90b36be · 90b36be
1 parent dc247a8
commit 90b36be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/data/export/upstart/process.conf.erb b/data/export/upstart/process.conf.erb
@@ -2,4 +2,4 @@ start on starting <%= app %>-<%= name %>
 stop on stopping <%= app %>-<%= name %>
 respawn
 
-exec su - <%= user %> -c 'cd <%= engine.root %>; export PORT=<%= port %>;<% engine.env.each_pair do |var,env| %> export <%= var.upcase %>=<%= shell_quote(env) %>; <% end %> <%= process.command %> >> <%= log %>/<%=name%>-<%=num%>.log 2>&1'
+exec su - <%= user %> -c 'cd <%= engine.root %>;<% environment.each_pair do |var,env| %> export <%= var.upcase %>=<%= shell_quote(env) %>;<% end %> <%= process.command %> >> <%= log %>/<%=name%>-<%=num%>.log 2>&1'
diff --git a/lib/foreman/export/upstart.rb b/lib/foreman/export/upstart.rb
@@ -17,7 +17,10 @@ def export
       write_template "upstart/process_master.conf.erb", "#{app}-#{name}.conf", binding
 
       1.upto(engine.formation[name]) do |num|
-        port = engine.port_for(process, num, 0)
+        environment = engine.env.dup
+        process.ports.each_with_index { |port, index|
+          environment[port] = engine.port_for(process, num, index).to_s
+        }
         write_template "upstart/process.conf.erb", "#{app}-#{name}-#{num}.conf", binding
       end
     end

diff --git a/spec/resources/export/upstart/app-alpha-1.conf b/spec/resources/export/upstart/app-alpha-1.conf
@@ -2,4 +2,4 @@ start on starting app-alpha
 stop on stopping app-alpha
 respawn
 
-exec su - app -c 'cd /tmp/app; export PORT=5000; ./alpha >> /var/log/app/alpha-1.log 2>&1'
+exec su - app -c 'cd /tmp/app; export PORT="5000"; ./alpha >> /var/log/app/alpha-1.log 2>&1'
diff --git a/spec/resources/export/upstart/app-alpha-2.conf b/spec/resources/export/upstart/app-alpha-2.conf
@@ -2,4 +2,4 @@ start on starting app-alpha
 stop on stopping app-alpha
 respawn
 
-exec su - app -c 'cd /tmp/app; export PORT=5001; ./alpha >> /var/log/app/alpha-2.log 2>&1'
+exec su - app -c 'cd /tmp/app; export PORT="5001"; ./alpha >> /var/log/app/alpha-2.log 2>&1'
diff --git a/spec/resources/export/upstart/app-bravo-1.conf b/spec/resources/export/upstart/app-bravo-1.conf
@@ -2,4 +2,4 @@ start on starting app-bravo
 stop on stopping app-bravo
 respawn
 
-exec su - app -c 'cd /tmp/app; export PORT=5100; ./bravo >> /var/log/app/bravo-1.log 2>&1'
+exec su - app -c 'cd /tmp/app; export PORT="5100"; ./bravo >> /var/log/app/bravo-1.log 2>&1'