From af3863ea9fd26fd8594262583bf47c211668631e Mon Sep 17 00:00:00 2001 From: luke Date: Tue, 30 Jan 2007 06:34:00 +0000 Subject: Fixing #440, albeit with a slightly hackish fix. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2120 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/util.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index 1242372ac..09cb7050d 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -297,6 +297,21 @@ module Util if f output = f.read else + # FIXME There really should be a better way to do this, + # but it looks like webrick is already setting close_on_exec, + # and setting it myself doesn't seem to do anything. So, + # not the best, but it'll have to do. + if Puppet[:listen] + ObjectSpace.each_object do |object| + if object.is_a?(TCPServer) and ! object.closed? + begin + object.close + rescue + # Just ignore these, I guess + end + end + end + end begin $stderr.close $stderr = $stdout.dup -- cgit