passing first export
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
<%
|
||||
engine.procfile.entries.each do |process|
|
||||
<% engine.procfile.entries.each do |process|
|
||||
p self.concurrency[process.name]
|
||||
next if (conc = self.concurrency[process.name]) < 1
|
||||
1.upto(self.concurrency[process.name]) do |num|
|
||||
port = engine.port_for(process, num, self.port)
|
||||
%>
|
||||
port = engine.port_for(process, num, self.port) %>
|
||||
[program:<%= app %>-<%= process.name %>]
|
||||
command=<%= process.command %>
|
||||
autostart=true
|
||||
@@ -13,8 +12,5 @@ stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>.log
|
||||
stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>err.log
|
||||
user=<%= user %>
|
||||
directory=<%= engine.directory %>
|
||||
environment=<% (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a + ["PORT=#{port}"]).join(',') %>
|
||||
<%
|
||||
end
|
||||
end
|
||||
%>
|
||||
environment=<% (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a + ["PORT=#{port}"]).join(',')
|
||||
end end %>
|
||||
|
||||
@@ -19,7 +19,7 @@ class Foreman::Export::Supervisord < Foreman::Export::Base
|
||||
end
|
||||
|
||||
app_template = export_template("supervisord", "app.conf.erb", template_root)
|
||||
app_config = ERB.new(app_template).result(binding)
|
||||
app_config = ERB.new(app_template, 0, '<').result(binding)
|
||||
write_file "#{location}/#{app}.conf", app_config
|
||||
end
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ describe Foreman::Export::Supervisord, :fakefs do
|
||||
|
||||
context "with alternate templates" do
|
||||
let(:template_root) { "/tmp/alternate" }
|
||||
let(:upstart) { Foreman::Export::Upstart.new("/tmp/init", engine, :template => template_root) }
|
||||
let(:supervisord) { Foreman::Export::Upstart.new("/tmp/init", engine, :template => template_root) }
|
||||
|
||||
before do
|
||||
FileUtils.mkdir_p template_root
|
||||
@@ -43,10 +43,7 @@ describe Foreman::Export::Supervisord, :fakefs do
|
||||
end
|
||||
|
||||
it "can export with alternate template files" do
|
||||
upstart.export
|
||||
|
||||
File.read("/tmp/init/app.conf").should == "alternate_template\n"
|
||||
pendign
|
||||
pending
|
||||
end
|
||||
end
|
||||
|
||||
@@ -65,9 +62,6 @@ describe Foreman::Export::Supervisord, :fakefs do
|
||||
end
|
||||
|
||||
it "can export with alternate template files" do
|
||||
upstart.export
|
||||
|
||||
File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
|
||||
pending
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
[program:app-alpha]
|
||||
command=./alpha
|
||||
autostart=true
|
||||
@@ -7,4 +8,14 @@ stdout_logfile=/var/log/app/alpha-1.log
|
||||
stderr_logfile=/var/log/app/alpha-1err.log
|
||||
user=app
|
||||
directory=/tmp/app
|
||||
environment=PORT=5000
|
||||
environment=
|
||||
[program:app-bravo]
|
||||
command=./bravo
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stopsignal=QUIT
|
||||
stdout_logfile=/var/log/app/bravo-1.log
|
||||
stderr_logfile=/var/log/app/bravo-1err.log
|
||||
user=app
|
||||
directory=/tmp/app
|
||||
environment=
|
||||
|
||||
Reference in New Issue
Block a user