einhorn 0.5.1 → 0.5.2

data/lib/einhorn/command/interface.rb

@@ -49,7 +49,7 @@ module Einhorn::Command
         # Need to avoid time-of-check to time-of-use bugs in blowing
         # away and recreating the old socketfile.
         destroy_old_command_socket(path)
-        UNIXServer.new(path)
+        Einhorn::Compat.unixserver_new(path)
       end
     end
 

data/lib/einhorn/command.rb

@@ -181,7 +181,8 @@ module Einhorn
       $stdout.flush
 
       # Spawn a child to pass the state through the pipe
-      read, write = IO.pipe
+      read, write = Einhorn::Compat.pipe
+
       fork do
         Einhorn::TransientState.whatami = :state_passer
         Einhorn::State.generation += 1
@@ -190,7 +191,12 @@ module Einhorn
         }
         read.close
 
-        write.write(YAML.dump(dumpable_state))
+        begin
+          write.write(YAML.dump(dumpable_state))
+        rescue Errno::EPIPE => e
+          e.message << " (state worker could not write state, which likely means the parent process has died)"
+          raise e
+        end
         write.close
 
         exit(0)
@@ -202,7 +208,11 @@ module Einhorn
       ENV.update(Einhorn::TransientState.environ)
 
       begin
-        exec [Einhorn::TransientState.script_name, Einhorn::TransientState.script_name], *(['--with-state-fd', read.fileno.to_s, '--'] + Einhorn::State.cmd)
+        Einhorn::Compat.exec(
+          Einhorn::TransientState.script_name,
+          ['--with-state-fd', read.fileno.to_s, '--'] + Einhorn::State.cmd,
+          :close_others => false
+          )
       rescue SystemCallError => e
         Einhorn.log_error("Could not reload! Attempting to continue. Error was: #{e}")
         Einhorn::State.reloading_for_preload_upgrade = false
@@ -235,10 +245,12 @@ module Einhorn
           # have to track and manually close FDs for other cases, we
           # may as well just reuse close_all rather than also set
           # cloexec on everything.
+          #
+          # Note that Ruby 1.9's close_others option is useful here.
           Einhorn::Event.close_all_for_worker
 
           prepare_child_environment
-          exec [cmd[0], cmd[0]], *cmd[1..-1]
+          Einhorn::Compat.exec(cmd[0], cmd[1..-1], :close_others => true)
         end
       end
 

data/lib/einhorn/compat.rb

@@ -0,0 +1,48 @@
+module Einhorn
+  module Compat
+    # In Ruby 2.1.0 (and possibly earlier), IO.pipe sets cloexec on
+    # the descriptors.
+    def self.pipe
+      readable, writeable = IO.pipe
+      cloexec!(readable, false)
+      cloexec!(writeable, false)
+      [readable, writeable]
+    end
+
+    def self.cloexec!(fd, enable)
+      original = fd.fcntl(Fcntl::F_GETFD)
+      if enable
+        new = original | Fcntl::FD_CLOEXEC
+      else
+        new = original & (-Fcntl::FD_CLOEXEC-1)
+      end
+      fd.fcntl(Fcntl::F_SETFD, new)
+    end
+
+    def self.cloexec?(fd)
+      fd.fcntl(Fcntl::F_GETFD) & Fcntl::FD_CLOEXEC
+    end
+
+    # Opts are ignored in Ruby 1.8
+    def self.exec(script, args, opts={})
+      cmd = [script, script]
+      begin
+        Kernel.exec(cmd, *(args + [opts]))
+      rescue TypeError
+        Kernel.exec(cmd, *args)
+      end
+    end
+
+    def self.unixserver_new(path)
+      server = UNIXServer.new(path)
+      cloexec!(server, false)
+      server
+    end
+
+    def self.accept_nonblock(server)
+      sock = server.accept_nonblock
+      cloexec!(sock, false)
+      sock
+    end
+  end
+end

data/lib/einhorn/event/command_server.rb

@@ -18,7 +18,7 @@ module Einhorn::Event
       begin
         while true
           return if @closed
-          sock = @server.accept_nonblock
+          sock = Einhorn::Compat.accept_nonblock(@server)
           Connection.open(sock)
         end
       rescue Errno::EAGAIN

data/lib/einhorn/event.rb

@@ -10,17 +10,14 @@ module Einhorn
     @@connections = {}
     @@timers = {}
 
-    def self.cloexec!(fd)
-      fd.fcntl(Fcntl::F_SETFD, fd.fcntl(Fcntl::F_GETFD) | Fcntl::FD_CLOEXEC)
-    end
-
     def self.init
-      readable, writeable = IO.pipe
+      readable, writeable = Einhorn::Compat.pipe
+
       @@loopbreak_reader = LoopBreaker.open(readable)
       @@loopbreak_writer = writeable
 
-      cloexec!(readable)
-      cloexec!(writeable)
+      Einhorn::Compat.cloexec!(readable, true)
+      Einhorn::Compat.cloexec!(writeable, true)
     end
 
     def self.close_all

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/einhorn.rb

@@ -373,6 +373,7 @@ module Einhorn
 end
 
 require 'einhorn/command'
+require 'einhorn/compat'
 require 'einhorn/client'
 require 'einhorn/event'
 require 'einhorn/worker'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,6 +155,7 @@ files:
 - lib/einhorn/client.rb
 - lib/einhorn/command.rb
 - lib/einhorn/command/interface.rb
+- lib/einhorn/compat.rb
 - lib/einhorn/event.rb
 - lib/einhorn/event/abstract_text_descriptor.rb
 - lib/einhorn/event/ack_timer.rb
@@ -195,18 +196,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4058700174817085581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4058700174817085581
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -221,3 +216,4 @@ test_files:
 - test/unit/einhorn/command/interface.rb
 - test/unit/einhorn/event.rb
 - test/unit/einhorn/worker_pool.rb
+has_rdoc: