yahns 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b73379a257ad0e09cd00b6d1b1b316ca6913992
-  data.tar.gz: 1e5203cb1d70720bdab3f9624b9766e3d49a9d51
+  metadata.gz: 8cc5928f1f563c752e54bb5facb8c9a0ca63bcd1
+  data.tar.gz: 4aced2fa3dbe3e094f724961ce9d840e7ce4d44f
 SHA512:
-  metadata.gz: 1c7a49cdbe694c1a27bd3f26d6db10b4b1f8ac11cf9307036957ba9df60aab266ef621cf515dcfd9eb592675648a0864b9949ba9b11ffccf083627a392353879
-  data.tar.gz: 2250ca7bf3fdfffbbb42cbb332cbe08bca48aa4c0e6066d3414e3248a2e666094ba2da07ff27312021558b67e45de59bdb10428fcd089c72bbfaeabd9f3488da
+  metadata.gz: 939413895994a570e99fc3d5efa2b7513787ea9a22f40d6ab746778a62c664da079d76a3808bbd4e25a0fd65d7a0e6f38db2b96a3b74cd527e0d305ce464d04a
+  data.tar.gz: 2dabbe0e008fb38b2b9cad8cdc0097565dcaa179ba53ee0bb8266a7f1e737634467f7b0ddc05913acd98f14c465274194129c1258bb5394dfa0557e12f7d9a07

data/Documentation/yahns-rackup.txt

@@ -132,7 +132,7 @@ See rackup documentation for more details.
 
 # CONTACT
 
-All feedback welcome via plain-text mail to <yahns-public@rubyforge.org>\
+All feedback welcome via plain-text mail to <yahns-public@yhbt.net>\
 No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT
@@ -148,5 +148,5 @@ yahns(1), yahns_config(5)
 * [Rack RDoc][1]
 * [Rackup HowTo][2]
 
-[1]: http://rack.rubyforge.org/doc/
+[1]: http://rdoc.info/gems/r#/gems/rack/frames
 [2]: http://wiki.github.com/rack/rack/tutorial-rackup-howto

data/Documentation/yahns.txt

@@ -55,7 +55,7 @@ See yahns_config(5) for documentation on the configuration file format.
 
 # CONTACT
 
-All feedback welcome via plain-text mail to <yahns-public@rubyforge.org>\
+All feedback welcome via plain-text mail to <yahns-public@yhbt.net>\
 No subscription is necessary to post to the mailing list.
 
 # COPYRIGHT

data/GIT-VERSION-GEN

@@ -4,7 +4,7 @@
 CONSTANT = "Yahns::VERSION"
 RVF = "lib/yahns/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.2.0"
+DEF_VER = "v1.3.0"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/HACKING

@@ -46,10 +46,10 @@ contact
 
 We use git(7) and develop yahns on a public mailing list like git
 developers do.  Please send patches via git-send-email(1) to the public
-mailing list at <yahns-public@rubyforge.org>.  Pull requests should be
+mailing list at <yahns-public@yhbt.net>.  Pull requests should be
 formatted using git-request-pull(1).
 
-Mailing list archives: http://rubyforge.org/pipermail/yahns-public/
+Mailing list archives: http://yhbt.net/yahns-public/
 No subscription is necessary to post to the mailing list.
 Please remember to Cc: all recipients.
 

data/README

@@ -56,17 +56,19 @@ Contact
 
 We are happy to see feedback of all types via plain-text email.
 Please send comments, user/dev discussion, patches, bug reports,
-and pull requests to the public mailing list at:
+and pull requests to the public inbox/mailing list at:
 
-	yahns-public@rubyforge.org
+	yahns-public@yhbt.net
 
 No subscription is necessary to post.  Please Cc: all recipients as
 subscription is not necessary.
 
-You may subscribe by sending a request to:
+You may subscribe by sending an email to:
 
-	yahns-public-request@rubyforge.org
-	with the Subject line: "subscribe"
+	yahns-public+subscribe@yhbt.net
+
+You may also subscribe to the public-inbox at git://yhbt.net/yahns-public
+using ssoma <http://ssoma.public-inbox.org/>
 
 This README is our homepage, we would rather be working on HTTP servers
 all day than worrying about the next browser vulnerability because

data/extras/exec_cgi.rb

@@ -62,9 +62,11 @@ class ExecCgi
     SERVER_PORT
     SERVER_PROTOCOL
     SERVER_SOFTWARE
+    SCRIPT_NAME
   ).map(&:freeze)  # frozen strings are faster for Hash assignments
 
   def initialize(*args)
+    @env = Hash === args[0] ? args.shift : {}
     @args = args
     first = args[0] or
       raise ArgumentError, "need path to executable"
@@ -75,12 +77,12 @@ class ExecCgi
 
   # Calls the app
   def call(env)
-    cgi_env = { "SCRIPT_NAME" => @args[0], "GATEWAY_INTERFACE" => "CGI/1.1" }
+    cgi_env = { "GATEWAY_INTERFACE" => "CGI/1.1" }
     PASS_VARS.each { |key| val = env[key] and cgi_env[key] = val }
     env.each { |key,val| cgi_env[key] = val if key =~ /\AHTTP_/ }
     pipe = MyIO.pipe
     errbody = pipe[0]
-    errbody.my_pid = Process.spawn(cgi_env, *@args,
+    errbody.my_pid = Process.spawn(cgi_env.merge!(@env), *@args,
                                    out: pipe[1], close_others: true)
     pipe[1].close
     pipe = pipe[0]

data/lib/yahns/fdmap.rb

@@ -79,6 +79,7 @@ class Yahns::Fdmap # :nodoc:
   # We should not be calling this too frequently, it is expensive
   # This is called while @fdmap_mtx is held
   def __expire(timeout)
+    return if @count == 0
     nr = 0
     now = Time.now.to_f
     (now - @last_expire) >= 1.0 or return # don't expire too frequently

data/lib/yahns/queue_kqueue.rb

@@ -26,7 +26,7 @@ class Yahns::Queue < SleepyPenguin::Kqueue::IO # :nodoc:
   # flags: QEV_RD/QEV_WR (usually QEV_RD)
   def queue_add(io, flags)
     # order is very important here, this thread cannot do anything with
-    # io once we've issued epoll_ctl() because another thread may use it
+    # io once we've issued kevent EV_ADD because another thread may use it
     @fdmap.add(io)
     fflags = ADD_ONESHOT
     if flags == QEV_QUIT
@@ -54,8 +54,8 @@ class Yahns::Queue < SleepyPenguin::Kqueue::IO # :nodoc:
       begin
         kevent(nil, max_events) do |_,_,_,_,_,io| # don't care for flags for now
           # Note: we absolutely must not do anything with io after
-          # we've called epoll_ctl on it, io is exclusive to this
-          # thread only until epoll_ctl is called on it.
+          # we've called kevent(...,EV_ADD) on it, io is exclusive to this
+          # thread only until kevent(...,EV_ADD) is called on it.
           case rv = io.yahns_step
           when :wait_readable
             kevent(Kevent[io.fileno, QEV_RD, ADD_ONESHOT, 0, 0, io])

data/lib/yahns/server.rb

@@ -203,7 +203,11 @@ class Yahns::Server # :nodoc:
 
   def daemon_ready
     @daemon_pipe.respond_to?(:syswrite) or return
-    @daemon_pipe.syswrite("#$$")
+    begin
+      @daemon_pipe.syswrite("#$$")
+    rescue => e
+      @logger.warn("grandparent died too soon?: #{e.message} (#{e.class})")
+    end
     @daemon_pipe.close
     @daemon_pipe = true # for SIGWINCH
   end
@@ -281,7 +285,7 @@ class Yahns::Server # :nodoc:
     @logger.info "reloading config_file=#{@config.config_file}"
     @config.config_reload!
     @config.commit!(self)
-    kill_each_worker(:QUIT)
+    soft_kill_each_worker("QUIT")
     Yahns::Log.reopen_all
     @logger.info "done reloading config_file=#{@config.config_file}"
   rescue StandardError, LoadError, SyntaxError => e

data/lib/yahns/server_mp.rb

@@ -7,14 +7,15 @@ module Yahns::ServerMP # :nodoc:
   def maintain_worker_count
     (off = @workers.size - @worker_processes) == 0 and return
     off < 0 and return spawn_missing_workers
-    @workers.each do |wpid, worker|
-      worker.nr >= @worker_processes and Process.kill(:QUIT, wpid)
+    @workers.each_value do |worker|
+      worker.nr >= @worker_processes and worker.soft_kill(Signal.list["QUIT"])
     end
   end
 
-  # delivers a signal to each worker
-  def kill_each_worker(signal)
-    @workers.each_key { |wpid| Process.kill(signal, wpid) }
+  # fakes delivery of a signal to each worker
+  def soft_kill_each_worker(sig)
+    sig = Signal.list[sig]
+    @workers.each_value { |worker| worker.soft_kill(sig) }
   end
 
   # this is the first thing that runs after forking in a child
@@ -94,18 +95,18 @@ module Yahns::ServerMP # :nodoc:
       case @sig_queue.shift
       when *EXIT_SIGS # graceful shutdown (twice for non graceful)
         @listeners.each(&:close).clear
-        kill_each_worker(:QUIT)
+        soft_kill_each_worker("QUIT")
         state = :QUIT
       when :USR1 # rotate logs
         usr1_reopen("master ")
-        kill_each_worker(:USR1)
+        soft_kill_each_worker("USR1")
       when :USR2 # exec binary, stay alive in case something went wrong
         reexec
       when :WINCH
         if @daemon_pipe
           state = :WINCH
           @logger.info "gracefully stopping all workers"
-          kill_each_worker(:QUIT)
+          soft_kill_each_worker("QUIT")
           @worker_processes = 0
         else
           @logger.info "SIGWINCH ignored because we're not daemonized"
@@ -157,7 +158,7 @@ module Yahns::ServerMP # :nodoc:
     # not performance critical
     watch.delete_if { |io| io.to_io.closed? }
     if r = IO.select(watch, nil, nil, alive ? nil : 0.01)
-      r[0].each { |io| io.yahns_step }
+      r[0].each(&:yahns_step)
     end
     case @sig_queue.shift
     when *EXIT_SIGS

data/lib/yahns/sigevent_efd.rb

@@ -8,7 +8,7 @@ class Yahns::Sigevent < SleepyPenguin::EventFD # :nodoc:
   end
 
   def sev_signal
-    incr(1) # eventfd_write
+    incr(1, true) # eventfd_write
   end
 
   def yahns_step

data/lib/yahns/sigevent_pipe.rb

@@ -13,7 +13,7 @@ class Yahns::Sigevent # :nodoc:
   end
 
   def sev_signal
-    @wr.kgio_write(".")
+    @wr.kgio_trywrite(".")
   end
 
   def yahns_step

data/lib/yahns/worker.rb

@@ -23,15 +23,44 @@ class Yahns::Worker # :nodoc:
   # This causes the worker to gracefully exit if the master
   # dies unexpectedly.
   def yahns_step
-    if @to_io.kgio_tryread(11) == nil
-      Process.kill(:QUIT, $$)
+    case buf = @to_io.kgio_tryread(4)
+    when String
+      # unpack the buffer and trigger the signal handler
+      signum = buf.unpack('l')
+      fake_sig(signum[0])
+      # keep looping, more signals may be queued
+    when nil # EOF: master died, but we are at a safe place to exit
+      fake_sig(:QUIT)
       @to_io.close
-    end
-    :ignore
+      return :ignore
+    when :wait_readable # keep waiting
+      return :ignore
+    end while true # loop, as multiple signals may be sent
   end
 
   # worker objects may be compared to just plain Integers
   def ==(other_nr) # :nodoc:
     @nr == other_nr
   end
+
+  # call a signal handler immediately without triggering EINTR
+  # We do not use the more obvious Process.kill(sig, $$) here since
+  # that signal delivery may be deferred.  We want to avoid signal delivery
+  # while the Rack app.call is running because some database drivers
+  # (e.g. ruby-pg) may cancel pending requests.
+  def fake_sig(sig) # :nodoc:
+    old_cb = trap(sig, "IGNORE")
+    old_cb.call
+  ensure
+    trap(sig, old_cb)
+  end
+
+  # master sends fake signals to children
+  def soft_kill(signum) # :nodoc:
+    # writing and reading 4 bytes on a pipe is atomic on all POSIX platforms
+    # Do not care in the odd case the buffer is full, here.
+    @wr.kgio_trywrite([signum].pack('l'))
+  rescue Errno::EPIPE
+    # worker will be reaped soon
+  end
 end

data/test/server_helper.rb

@@ -75,6 +75,7 @@ module ServerHelper
   def mkserver(cfg)
     fork do
       ENV["YAHNS_FD"] = @srv.fileno.to_s
+      @srv.autoclose = false
       yield if block_given?
       Yahns::Server.new(cfg).start.join
     end

data/test/test_server.rb

@@ -227,6 +227,7 @@ class TestServer < Testcase
     pid = fork do
       bpipe[1].close
       ENV["YAHNS_FD"] = unix_srv.fileno.to_s
+      unix_srv.autoclose = false
       srv.start.join
     end
     bpipe[0].close

data/test/test_wbuf.rb

@@ -15,6 +15,7 @@ class TestWbuf < Testcase
   end
 
   def test_wbuf
+    skip "sendfile not Linux-compatible" if RUBY_PLATFORM !~ /linux/
     buf = "*" * (16384 * 2)
     nr = 1000
     [ true, false ].each do |persist|
@@ -59,6 +60,7 @@ class TestWbuf < Testcase
 
   def test_wbuf_blocked
     a, b = socketpair
+    skip "sendfile not Linux-compatible" if RUBY_PLATFORM !~ /linux/
     buf = "." * 4096
     4.times do
       begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yahns
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - yahns hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio