admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Clean up socket and filesystem resources separately

Browse Source
This commit is contained in:
Jack Nagel 2015-04-24 22:13:45 -04:00
parent 16dfe3dd40
commit f7ded45bc7
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/utils/fork.rb
View File

@ -3,12 +3,13 @@ require "socket"
module Utils module Utils
def self.safe_fork(&block) def self.safe_fork(&block)
socket_path = "#{Dir.mktmpdir("homebrew", HOMEBREW_TEMP)}/socket" Dir.mktmpdir("homebrew", HOMEBREW_TEMP) do |tmpdir|
server = UNIXServer.new(socket_path) UNIXServer.open("#{tmpdir}/socket") do |server|
ENV["HOMEBREW_ERROR_PIPE"] = socket_path
read, write = IO.pipe read, write = IO.pipe
pid = fork do pid = fork do
ENV["HOMEBREW_ERROR_PIPE"] = server.path
begin begin
server.close server.close
read.close read.close
@ -37,8 +38,7 @@ module Utils
raise Interrupt if $?.exitstatus == 130 raise Interrupt if $?.exitstatus == 130
raise "Suspicious failure" unless $?.success? raise "Suspicious failure" unless $?.success?
end end
ensure end
server.close end
FileUtils.rm_r File.dirname(socket_path)
end end
end end