Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6c5e6ddea | ||
|
|
261164e694 | ||
|
|
92e637a231 | ||
|
|
08b94716f2 |
@@ -43,6 +43,9 @@ The following options control how the application is run:
|
|||||||
Use this name rather than the application's root directory name as the
|
Use this name rather than the application's root directory name as the
|
||||||
name of the application when exporting.
|
name of the application when exporting.
|
||||||
|
|
||||||
|
* `-l`, `--log`:
|
||||||
|
Specify the directory to place process logs in.
|
||||||
|
|
||||||
* `-c`, `--concurrency`:
|
* `-c`, `--concurrency`:
|
||||||
Specify the number of each process type to run. The value passed in
|
Specify the number of each process type to run. The value passed in
|
||||||
should be in the format `process=num,process=num`
|
should be in the format `process=num,process=num`
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
pre-start script
|
pre-start script
|
||||||
|
|
||||||
bash << "EOF"
|
bash << "EOF"
|
||||||
mkdir -p /var/log/<%= app %>
|
mkdir -p <%= log_root %>/<%= app %>
|
||||||
chown -R <%= user %> /var/log/<%= app %>
|
chown -R <%= user %> <%= log_root %>/<%= app %>
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
end script
|
end script
|
||||||
|
|||||||
@@ -3,4 +3,4 @@ stop on stopping <%= app %>-<%= process.name %>
|
|||||||
respawn
|
respawn
|
||||||
|
|
||||||
chdir <%= engine.directory %>
|
chdir <%= engine.directory %>
|
||||||
exec su <%= user %> -c "<%= process.command %> >> /var/log/<%=app%>/<%=process.name%>-<%=num%>.log 2>&1"
|
exec su <%= user %> -c "<%= process.command %> >> <%= log_root %>/<%=app%>/<%=process.name%>-<%=num%>.log 2>&1"
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
Gem::Specification.new do |s|
|
Gem::Specification.new do |s|
|
||||||
s.name = %q{foreman}
|
s.name = %q{foreman}
|
||||||
s.version = "0.4.5"
|
s.version = "0.4.6"
|
||||||
|
|
||||||
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||||
s.authors = ["David Dollar"]
|
s.authors = ["David Dollar"]
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
module Foreman
|
module Foreman
|
||||||
|
|
||||||
VERSION = "0.4.5"
|
VERSION = "0.4.6"
|
||||||
|
|
||||||
class AppDoesNotExist < Exception; end
|
class AppDoesNotExist < Exception; end
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ class Foreman::CLI < Thor
|
|||||||
desc "export FORMAT LOCATION", "Export the application to another process management format"
|
desc "export FORMAT LOCATION", "Export the application to another process management format"
|
||||||
|
|
||||||
method_option :app, :type => :string, :aliases => "-a"
|
method_option :app, :type => :string, :aliases => "-a"
|
||||||
|
method_option :log, :type => :string, :aliases => "-l"
|
||||||
method_option :user, :type => :string, :aliases => "-u"
|
method_option :user, :type => :string, :aliases => "-u"
|
||||||
method_option :concurrency, :type => :string, :aliases => "-c",
|
method_option :concurrency, :type => :string, :aliases => "-c",
|
||||||
:banner => '"alpha=5,bar=3"'
|
:banner => '"alpha=5,bar=3"'
|
||||||
@@ -41,6 +42,7 @@ class Foreman::CLI < Thor
|
|||||||
formatter.new(engine).export(location,
|
formatter.new(engine).export(location,
|
||||||
:name => options[:app],
|
:name => options[:app],
|
||||||
:user => options[:user],
|
:user => options[:user],
|
||||||
|
:log => options[:log],
|
||||||
:concurrency => options[:concurrency]
|
:concurrency => options[:concurrency]
|
||||||
)
|
)
|
||||||
rescue Foreman::Export::Exception => ex
|
rescue Foreman::Export::Exception => ex
|
||||||
|
|||||||
@@ -5,7 +5,9 @@ class Foreman::Export::Inittab < Foreman::Export::Base
|
|||||||
def export(fname=nil, options={})
|
def export(fname=nil, options={})
|
||||||
app = options[:app] || File.basename(engine.directory)
|
app = options[:app] || File.basename(engine.directory)
|
||||||
user = options[:user] || app
|
user = options[:user] || app
|
||||||
log_dir = "/var/log/#{app}"
|
log_root = options[:log] || "/var/log"
|
||||||
|
|
||||||
|
log_dir = "#{log_root}/#{app}"
|
||||||
|
|
||||||
concurrency = parse_concurrency(options[:concurrency])
|
concurrency = parse_concurrency(options[:concurrency])
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ class Foreman::Export::Upstart < Foreman::Export::Base
|
|||||||
|
|
||||||
app = options[:app] || File.basename(engine.directory)
|
app = options[:app] || File.basename(engine.directory)
|
||||||
user = options[:user] || app
|
user = options[:user] || app
|
||||||
|
log_root = options[:log] || "/var/log"
|
||||||
|
|
||||||
Dir["#{location}/#{app}*.conf"].each do |file|
|
Dir["#{location}/#{app}*.conf"].each do |file|
|
||||||
say "cleaning up: #{file}"
|
say "cleaning up: #{file}"
|
||||||
|
|||||||
@@ -43,6 +43,9 @@ The following options control how the application is run:
|
|||||||
Use this name rather than the application's root directory name as the
|
Use this name rather than the application's root directory name as the
|
||||||
name of the application when exporting.
|
name of the application when exporting.
|
||||||
|
|
||||||
|
* `-l`, `--log`:
|
||||||
|
Specify the directory to place process logs in.
|
||||||
|
|
||||||
* `-c`, `--concurrency`:
|
* `-c`, `--concurrency`:
|
||||||
Specify the number of each process type to run. The value passed in
|
Specify the number of each process type to run. The value passed in
|
||||||
should be in the format `process=num,process=num`
|
should be in the format `process=num,process=num`
|
||||||
|
|||||||
Reference in New Issue
Block a user