Skip to content
Permalink
Browse files

Adding some Heroku configs

  • Loading branch information...
Arfon Smith
Arfon Smith committed Feb 22, 2016
1 parent 827aa72 commit f222a3d2beeb7cb3eb23a1bc29c15bc73421678a
Showing with 73 additions and 1 deletion.
  1. +1 −0 Procfile
  2. +1 −1 config/database.yml
  3. +47 −0 config/newrelic.yml
  4. +24 −0 config/unicorn.rb
@@ -0,0 +1 @@
web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
@@ -15,4 +15,4 @@ test:
production:
adapter: postgresql
encoding: unicode
url: <%= ENV['HEROKU_POSTGRESQL_VIOLET_URL'] %>
url: <%= ENV['DATABASE_URL'] %>
@@ -0,0 +1,47 @@
#
# This file configures the New Relic Agent. New Relic monitors Ruby, Java,
# .NET, PHP, Python and Node applications with deep visibility and low
# overhead. For more information, visit www.newrelic.com.
#
# Generated February 22, 2016
#
# For full documentation of agent configuration options, please refer to
# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration

common: &default_settings
# Required license key associated with your New Relic account.
license_key: <%= ENV["NEW_RELIC_LICENSE_KEY"] %>

# Your application name. Renaming here affects where data displays in New
# Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
app_name: The Journal of Open Source Software

# To disable the agent regardless of other settings, uncomment the following:
# agent_enabled: false

# Logging level for log/newrelic_agent.log
log_level: info


# Environment-specific settings are in this section.
# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment.
# If your application has other named environments, configure them here.
development:
<<: *default_settings
app_name: My Application (Development)

# NOTE: There is substantial overhead when running in developer mode.
# Do not use for production or load testing.
developer_mode: true

test:
<<: *default_settings
# It doesn't make sense to report to New Relic from automated test runs.
monitor_mode: false

staging:
<<: *default_settings
app_name: My Application (Staging)

production:
<<: *default_settings
@@ -0,0 +1,24 @@
worker_processes 3
timeout 30
preload_app true

before_fork do |server, worker|

Signal.trap 'TERM' do
puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
Process.kill 'QUIT', Process.pid
end

defined?(ActiveRecord::Base) and
ActiveRecord::Base.connection.disconnect!
end

after_fork do |server, worker|

Signal.trap 'TERM' do
puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
end

defined?(ActiveRecord::Base) and
ActiveRecord::Base.establish_connection
end

0 comments on commit f222a3d

Please sign in to comment.
You can’t perform that action at this time.