diff --git a/data/export/supervisord/app.conf.erb b/data/export/supervisord/app.conf.erb index 6ee197c..9e2b156 100644 --- a/data/export/supervisord/app.conf.erb +++ b/data/export/supervisord/app.conf.erb @@ -1,11 +1,11 @@ -<% +<% engine.procfile.entries.each do |process| - next if (conc = self.concurrency[process.name]) < 1 - 1.upto(self.concurrency[process.name]) do |num| - port = engine.port_for(process, num, self.port) + next if (conc = self.concurrency[process.name]) < 1 + 1.upto(self.concurrency[process.name]) do |num| + port = engine.port_for(process, num, self.port) name = if (conc > 1); "#{process.name}-#{num}" else process.name; end environment = (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a << "PORT=#{port}") -%> +%> [program:<%= app %>-<%= name %>] command=<%= process.command %> autostart=true @@ -16,6 +16,6 @@ stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>-err.log user=<%= user %> directory=<%= engine.directory %> environment=<%= environment.join(',') %><% - end -end + end +end %> \ No newline at end of file diff --git a/spec/resources/export/supervisord/app-alpha-2.conf b/spec/resources/export/supervisord/app-alpha-2.conf index 210ec71..c16b72f 100644 --- a/spec/resources/export/supervisord/app-alpha-2.conf +++ b/spec/resources/export/supervisord/app-alpha-2.conf @@ -1,4 +1,4 @@ - + [program:app-alpha-1] command=./alpha autostart=true @@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1-out.log stderr_logfile=/var/log/app/alpha-1-err.log user=app directory=/tmp/app -environment=PORT=5000 +environment=PORT=5000 [program:app-alpha-2] command=./alpha autostart=true diff --git a/spec/resources/export/supervisord/app.conf b/spec/resources/export/supervisord/app.conf index 15ed279..efcb28e 100644 --- a/spec/resources/export/supervisord/app.conf +++ b/spec/resources/export/supervisord/app.conf @@ -1,4 +1,4 @@ - + [program:app-alpha] command=./alpha autostart=true @@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1-out.log stderr_logfile=/var/log/app/alpha-1-err.log user=app directory=/tmp/app -environment=PORT=5000 +environment=PORT=5000 [program:app-bravo] command=./bravo autostart=true