Skip to content

Commit

Permalink
Let Foreman handle processes
Browse files Browse the repository at this point in the history
Foreman does a better job at making sure each process is killed.
  • Loading branch information
holman committed Feb 15, 2012
1 parent f6fca2d commit d82637a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ gem 'sinatra_auth_github', '~>0.3.0'
gem 'sprockets'
gem 'sass', '~>3.1'
gem 'coffee-script'
gem 'websocket-rack'
gem 'pusher'
gem 'foreman'
gem 'thin'

if RUBY_PLATFORM.downcase.include?("darwin")
gem 'rb-appscript'
Expand Down
17 changes: 8 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ GEM
execjs
coffee-script-source (1.2.0)
daemons (1.1.6)
em-websocket (0.3.6)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
eventmachine (1.0.0.beta.4)
eventmachine (0.12.10)
execjs (1.3.0)
multi_json (~> 1.0)
faraday (0.7.6)
addressable (~> 2.2)
multipart-post (~> 1.1)
rack (~> 1.1)
foreman (0.39.0)
term-ansicolor (~> 1.0.7)
thor (>= 0.13.6)
hike (1.2.1)
json (1.6.5)
metaclass (0.0.1)
Expand Down Expand Up @@ -64,21 +64,19 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.7)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
warden (1.1.0)
rack (>= 1.0)
warden-github (0.3.1)
json (~> 1.5)
oauth2 (~> 0.5.2)
warden (~> 1.0)
websocket-rack (0.3.2)
em-websocket (~> 0.3.1)
rack
thin
yajl-ruby (1.1.0)

PLATFORMS
Expand All @@ -87,6 +85,7 @@ PLATFORMS
DEPENDENCIES
SystemTimer (~> 1.2.3)
coffee-script
foreman
mocha
mustache (~> 0.99.4)
pusher
Expand All @@ -100,5 +99,5 @@ DEPENDENCIES
sinatra
sinatra_auth_github (~> 0.3.0)
sprockets
websocket-rack
thin
yajl-ruby
2 changes: 2 additions & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
web: bundle exec thin start -p 5050
realtime: bin/realtime
3 changes: 1 addition & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ end

desc "Start the server"
task :start do
sh "bin/realtime &"
sh "thin start -p5050"
Kernel.exec "bundle exec foreman start"
end

namespace :redis do
Expand Down

0 comments on commit d82637a

Please sign in to comment.