From d247b5d95a3ad2de65cc909db21fdfbc6194b4c9 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 30 Jun 2009 17:47:55 -0700 Subject: Retry listen() on EADDRINUSE 5 times ever 500ms This number of retries and delay taken directly from nginx --- lib/unicorn.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/unicorn.rb b/lib/unicorn.rb index 3c8c4c4..a2893fd 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -176,16 +176,23 @@ module Unicorn def listen(address, opt = {}.merge(@listener_opts[address] || {})) return if String === address && listener_names.include?(address) - if io = bind_listen(address, opt) + delay, tries = 0.5, 5 + begin + io = bind_listen(address, opt) unless TCPServer === io || UNIXServer === io IO_PURGATORY << io io = server_cast(io) end logger.info "listening on addr=#{sock_name(io)} fd=#{io.fileno}" LISTENERS << io - else + return io + rescue Errno::EADDRINUSE => err logger.error "adding listener failed addr=#{address} (in use)" - raise Errno::EADDRINUSE, address + raise err if tries == 0 + tries -= 1 + logger.error "retrying in #{delay} seconds (#{tries} tries left)" + sleep(delay) + retry end end -- cgit v1.2.3-24-ge0c7