Skip to content
This repository was archived by the owner on Feb 14, 2018. It is now read-only.

Switch to Puma for web server instead of Thin #331

Open
kyledrake wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to Puma for web server instead of Thin #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem "sinatra", '1.2.6'
gem "haml"
gem "sass"
gem "json"
gem "thin"
gem "puma"
gem "RubyInline"
gem "ZenTest", '<= 4.6.0' # dependency of RubyInline, newer versions break Heroku deploy
gem "png"
Expand Down
11 changes: 3 additions & 8 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ GEM
mime-types (~> 1.15)
multi_json (~> 1.0)
rest-client (~> 1.6.1)
daemons (1.1.8)
diff-lcs (1.1.3)
eventmachine (0.12.10)
eventmachine (0.12.10-java)
excon (0.15.5)
ffi (1.1.3)
ffi (1.1.3-java)
Expand Down Expand Up @@ -57,6 +54,8 @@ GEM
nokogiri (1.5.5)
nokogiri (1.5.5-java)
png (1.2.0)
puma (1.6.3)
rack (~> 1.2)
rack (1.4.1)
rack-test (0.5.6)
rack (>= 1.0)
Expand Down Expand Up @@ -100,10 +99,6 @@ GEM
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
spoon (0.0.1)
thin (1.4.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.3.3)
xpath (0.1.4)
nokogiri (~> 1.3)
Expand All @@ -123,6 +118,7 @@ DEPENDENCIES
launchy
memcache-client
png
puma
rack-test (= 0.5.6)
rake
rest-client
Expand All @@ -136,4 +132,3 @@ DEPENDENCIES
sass
selenium-webdriver (= 2.22.2)
sinatra (= 1.2.6)
thin
2 changes: 1 addition & 1 deletion Procfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: bundle exec thin start -R server/sinatra/config.ru -p $PORT
web: bundle exec puma -C server/sinatra/procfile_puma_config.rb -e production -p $PORT
4 changes: 2 additions & 2 deletions ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ The server is a ruby bundle. Get the bundler gem and then use it to get everythi
Launch the server with this bundle command:

cd server/sinatra
bundle exec rackup -s thin -p 1111
bundle exec rackup -s puma -p 1111

Now go to your browser and browse your new wiki:

Expand Down Expand Up @@ -174,5 +174,5 @@ for those not using Ruby much, but using Debian:
sudo gem install bundle
sudo /var/lib/gems/1.8/bin/bundle install
rvm 1.9.2
/var/lib/gems/1.8/bin/bundle exec rackup -s thin -p 1111
/var/lib/gems/1.8/bin/bundle exec rackup -s puma -p 1111

1 change: 1 addition & 0 deletions server/sinatra/procfile_puma_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rackup './server/sinatra/config.ru'