Merge remote-tracking branch 'origin/master' into fix-server-shutdown

TwP · May 29, 2015 · bdfed8f · bdfed8f
2 parents 8982d3e + 55d00ab
commit bdfed8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/servolux/child.rb b/lib/servolux/child.rb
@@ -121,7 +121,7 @@ def stop
     end
 
     kill if alive?
-    @io.close rescue nil
+    @io.close unless @io.nil? || @io.closed?
     @io = nil
     self
   end

diff --git a/lib/servolux/daemon.rb b/lib/servolux/daemon.rb
@@ -363,9 +363,9 @@ def exec( *args )
 
     skip = [STDIN, STDOUT, STDERR]
     skip << @piper.socket if @piper
-    ObjectSpace.each_object(IO) { |obj|
-      next if skip.include? obj
-      obj.close rescue nil
+    ObjectSpace.each_object(IO) { |io|
+      next if skip.include? io
+      io.close unless io.closed?
     }
 
     before_exec.call if before_exec.respond_to? :call

diff --git a/lib/servolux/piper.rb b/lib/servolux/piper.rb
@@ -153,7 +153,7 @@ def initialize( *args )
   # @return [Piper] self
   #
   def close
-    @socket.close rescue nil
+    @socket.close unless @socket.closed?
     self
   end