diff options
author | danielgrippi <danielgrippi@gmail.com> | 2012-01-16 04:05:11 +0400 |
---|---|---|
committer | danielgrippi <danielgrippi@gmail.com> | 2012-01-16 04:07:00 +0400 |
commit | f2cc8b4e41c85b3f68617710b13e2db5a0217ffe (patch) | |
tree | 191df1f21063f098310fa26abe6e302cb9a339f9 /config/unicorn.rb | |
parent | 177f608276c1e9bbae6e74338580db2cec72d8fd (diff) |
Revert "move unicorn into the heroku group till we decide if we switch completly to it or not"
This reverts commit 641cedf343afd1266d3e5aad1b5bb9506e33f65e.
Revert "Merge pull request #2663 from torrancew/with_unicorn"
This reverts commit 2a2efd097f95190b646b6e6e175d73e2c4089b06, reversing
changes made to 78978f051e9843a20ba18e06e6fce3dbacd800de.
Diffstat (limited to 'config/unicorn.rb')
-rw-r--r-- | config/unicorn.rb | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/config/unicorn.rb b/config/unicorn.rb deleted file mode 100644 index 1da12c27a..000000000 --- a/config/unicorn.rb +++ /dev/null @@ -1,45 +0,0 @@ -rails_env = ENV['RAILS_ENV'] || 'development' - -# Enable and set these to run the worker as a different user/group -#user = 'diaspora' -#group = 'diaspora' - -worker_processes 3 - -## Load the app before spawning workers -#preload_app true - -# How long to wait before killing an unresponsive worker -timeout 30 - -#pid '/var/run/diaspora/diaspora.pid' -#listen '/var/run/diaspora/diaspora.sock', :backlog => 2048 - -# Ruby Enterprise Feature -if GC.respond_to?(:copy_on_write_friendly=) - GC.copy_on_write_friendly = true -end - - -before_fork do |server, worker| - # If using preload_app, enable this line - #ActiveRecord::Base.disconnect! - - old_pid = '/var/run/diaspora/diaspora.pid.oldbin' - if File.exists?(old_pid) && server.pid != old_pid - begin - Process.kill("QUIT", File.read(old_pid).to_i) - rescue Errno::ENOENT, Errno::ESRCH - # someone else did our job for us - end - end -end - - -after_fork do |server, worker| - # If using preload_app, enable this line - #ActiveRecord::Base.establish_connection - - # Enable this line to have the workers run as different user/group - #worker.user(user, group) -end |