choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update rubocop to version 0.34.0

This commit is contained in:
Erik Michaels-Ober 2015-09-05 10:09:04 +02:00
parent 1c4d49463e
commit 37a17fed9a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -174,7 +174,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
rubocop (0.33.0) rubocop (0.34.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0) parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)

6
config/unicorn.rb
View File

@ -2,17 +2,15 @@ worker_processes 3
timeout 30 timeout 30
preload_app true preload_app true
before_fork do |server, worker| before_fork do
Signal.trap 'TERM' do Signal.trap 'TERM' do
puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
Process.kill 'QUIT', Process.pid Process.kill 'QUIT', Process.pid
end end
ActiveRecord::Base.connection.disconnect! ActiveRecord::Base.connection.disconnect!
end end
after_fork do |server, worker| after_fork do
Signal.trap 'TERM' do Signal.trap 'TERM' do
puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
end end
ActiveRecord::Base.establish_connection ActiveRecord::Base.establish_connection
end end