Skip to content

Commit

Permalink
Merge pull request ddollar#663 from cptobvious/supervisord_defaults
Browse files Browse the repository at this point in the history
Supervisor Defaults
  • Loading branch information
ddollar authored Mar 27, 2017
2 parents 2dac90e + 2dac12d commit 72521e9
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec

group :test do
gem 'rake'
gem 'fakefs', '~> 0.4.0'
gem 'fakefs', '~> 0.10.0'
gem 'rspec', '~> 3.5'
gem "simplecov", :require => false
gem 'timecop'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GEM
simplecov (>= 0.7.1, < 1.0.0)
diff-lcs (1.2.5)
docile (1.1.5)
fakefs (0.4.3)
fakefs (0.10.1)
hpricot (0.8.6)
hpricot (0.8.6-java)
json (1.8.3)
Expand Down Expand Up @@ -62,7 +62,7 @@ PLATFORMS
DEPENDENCIES
aws-s3
codeclimate-test-reporter
fakefs (~> 0.4.0)
fakefs (~> 0.10.0)
foreman!
rake
ronn
Expand All @@ -72,4 +72,4 @@ DEPENDENCIES
yard

BUNDLED WITH
1.11.2
1.13.7
1 change: 0 additions & 1 deletion data/export/supervisord/app.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ engine.each_process do |name, process|
command=<%= process.command %>
autostart=true
autorestart=true
stopsignal=QUIT
stdout_logfile=<%= log %>/<%= name %>-<%= num %>.log
stderr_logfile=<%= log %>/<%= name %>-<%= num %>.error.log
user=<%= user %>
Expand Down
4 changes: 0 additions & 4 deletions spec/resources/export/supervisord/app-alpha-1.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
command=./alpha
autostart=true
autorestart=true
stopsignal=QUIT
stdout_logfile=/var/log/app/alpha-1.log
stderr_logfile=/var/log/app/alpha-1.error.log
user=app
Expand All @@ -13,7 +12,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5000"
command=./bravo
autostart=true
autorestart=true
stopsignal=QUIT
stdout_logfile=/var/log/app/bravo-1.log
stderr_logfile=/var/log/app/bravo-1.error.log
user=app
Expand All @@ -24,7 +22,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5100"
command=./foo_bar
autostart=true
autorestart=true
stopsignal=QUIT
stdout_logfile=/var/log/app/foo_bar-1.log
stderr_logfile=/var/log/app/foo_bar-1.error.log
user=app
Expand All @@ -35,7 +32,6 @@ environment=FOO="bar",URL="http://example.com/api?foo=bar&baz=1",PORT="5200"
command=./foo-bar
autostart=true
autorestart=true
stopsignal=QUIT
stdout_logfile=/var/log/app/foo-bar-1.log
stderr_logfile=/var/log/app/foo-bar-1.error.log
user=app
Expand Down
2 changes: 0 additions & 2 deletions spec/resources/export/supervisord/app-alpha-2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
command=./alpha
autostart=true
autorestart=true
stopsignal=QUIT
stdout_logfile=/var/log/app/alpha-1.log
stderr_logfile=/var/log/app/alpha-1.error.log
user=app
Expand All @@ -13,7 +12,6 @@ environment=PORT="5000"
command=./alpha
autostart=true
autorestart=true
stopsignal=QUIT
stdout_logfile=/var/log/app/alpha-2.log
stderr_logfile=/var/log/app/alpha-2.error.log
user=app
Expand Down

0 comments on commit 72521e9

Please sign in to comment.