diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-03-21 22:46:34 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-03-22 21:25:17 -0700 |
| commit | 451a1022e16ec6307328125a41244a837c6edcdf (patch) | |
| tree | b80a8d2c6fc5c0369960e5b429e396ef5ff91705 /lib | |
| parent | 5d57a6f2525c3c1feea98d64e1caf2f32147cf7f (diff) | |
| download | unicorn-451a1022e16ec6307328125a41244a837c6edcdf.tar.gz | |
Since we always unlink existing sockets when binding, there's no point in having code to unlink the sockets when we exit. Additionally, the old code path was racy.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/unicorn.rb | 1 | ||||
| -rw-r--r-- | lib/unicorn/socket.rb | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb index 2f86de2..eefbfc1 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -106,7 +106,6 @@ module Unicorn @listeners.delete_if do |io| if dead_names.include?(sock_name(io)) @io_purgatory.delete_if { |pio| pio.fileno == io.fileno } - destroy_safely(io) true else false diff --git a/lib/unicorn/socket.rb b/lib/unicorn/socket.rb index 4913261..9519448 100644 --- a/lib/unicorn/socket.rb +++ b/lib/unicorn/socket.rb @@ -62,13 +62,6 @@ module Unicorn end end - def destroy_safely(io) - if io.respond_to?(:path) && File.stat(io.path).ino == io.stat.ino - File.unlink(io.path) rescue nil - end - io.close rescue nil - end - # creates a new server, socket. address may be a HOST:PORT or # an absolute path to a UNIX socket. address can even be a Socket # object in which case it is immediately returned |