File tree 5 files changed +23
-3
lines changed
5 files changed +23
-3
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ KalibroProcessor is the processing web service for Mezuro.
4
4
5
5
== Unreleased
6
6
7
+ - Replace webrick by puma
8
+
7
9
== v.1.3.3 - 29/07/2016
8
10
9
11
* Insert in one query all aggregated MetricResults
Original file line number Diff line number Diff line change @@ -109,7 +109,8 @@ group :cucumber do
109
109
# gem 'database_cleaner' # Removed because it is getting added above.
110
110
end
111
111
112
-
112
+ # Use puma as the app server
113
+ gem 'puma'
113
114
114
115
# Use ActiveModel has_secure_password
115
116
# gem 'bcrypt-ruby', '~> 3.0.0'
Original file line number Diff line number Diff line change 266
266
method_source (~> 0.8.1 )
267
267
slop (~> 3.4 )
268
268
psych (2.0.15 )
269
+ puma (3.6.0 )
269
270
rack (1.6.4 )
270
271
rack-test (0.6.3 )
271
272
rack (>= 1.0 )
@@ -415,6 +416,7 @@ DEPENDENCIES
415
416
mocha
416
417
pg
417
418
psych (~> 2.0.12 )
419
+ puma
418
420
rails (= 4.2.4 )
419
421
rails-html-sanitizer (~> 1.0 )
420
422
rspec-rails (~> 3.3.2 )
@@ -427,4 +429,4 @@ DEPENDENCIES
427
429
unparser (< 0.2.5 )
428
430
429
431
BUNDLED WITH
430
- 1.12.5
432
+ 1.13.3
Original file line number Diff line number Diff line change 1
- web : bundle exec rails s -p $PORT -e $RAILS_ENV
1
+ web : bundle exec puma -C config/puma.rb
2
2
jobs : bundle exec rake jobs:work
Original file line number Diff line number Diff line change
1
+ workers Integer ( ENV [ 'WEB_CONCURRENCY' ] || 2 )
2
+ threads_count = Integer ( ENV [ 'RAILS_MAX_THREADS' ] || 5 )
3
+ threads threads_count , threads_count
4
+
5
+ preload_app!
6
+
7
+ rackup DefaultRackup
8
+ port ENV [ 'PORT' ] || 8082
9
+ environment ENV [ 'RACK_ENV' ] || 'development'
10
+
11
+ on_worker_boot do
12
+ # Worker specific setup for Rails 4.1
13
+ # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
14
+ ActiveRecord ::Base . establish_connection
15
+ end
You can’t perform that action at this time.
0 commit comments