about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-03-21 22:46:34 -0700
committerEric Wong <normalperson@yhbt.net>2009-03-25 16:27:49 -0700
commita87866f83c0185757b2f85aeab17e2a9553b6ae1 (patch)
tree648fc3c8a0861a8d2c23a5dd33667775f3805fd1 /lib
parent78668173ab0e78c5c94fe23b916a81822c24bf9c (diff)
downloadunicorn-a87866f83c0185757b2f85aeab17e2a9553b6ae1.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.rb1
-rw-r--r--lib/unicorn/socket.rb7
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