prefork_engine 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b3d832f86df0ffd4cc4f50995409fdf6e5fa03
-  data.tar.gz: 7cccd2f8bf896a14e5695616cf745b86c0905c10
+  metadata.gz: 751dd9a7be4cb03e610d40d41690387f9f99d209
+  data.tar.gz: 6b84aaf21286708313a0908374b51eac0ed0664c
 SHA512:
-  metadata.gz: 0ca812d9907a61cfe97d6199d3c3f72c56b4e92ef82a34b1748933cb10affecac50081d1cf0e1235e9a173323f3bebae218e6c7150661bfd9cd1b08bfa2ca1a9
-  data.tar.gz: 772d6caa397e481338a53018fe948f83172cffbf52bcc057190e4d963acf427a9a3498d040e54daff91c9b7a8b1cb4858bca24cedae3c3e40027f58586e89b4a
+  metadata.gz: ec62efd7c0c4302652489608b83a9f7f4d703e679f6517bc020ce7f3a92d6153fb53e552aa7923a578991fff0252a2bb05c9e2c9736e290337d43385d95b529a
+  data.tar.gz: 0bf1d99655ec5a9e183cc2d59f23a51e5ee01d67b680efba23166bf2794bd8b62999c16e737989239076ef592a28087991c45e3a9cdc5829ce4519657452c87f

data/Changes

@@ -1,4 +1,8 @@
+0.0.3 2014-12-16T12:15:11Z
+
+    - fix signal trap test
+
 0.0.2 2014-12-11T13:22:49Z
 
     - remove unnecessary gems from requires 
-    - add example rack handler
+    - add example rack handler

data/example/starlet.rb

@@ -69,7 +69,6 @@ module Rack
         @server = nil
         @_is_tcp = false
         @_using_defer_accept = false
-
       end
 
       def setup_listener()
@@ -146,43 +145,41 @@ module Rack
             exit!(true)
           end
         }
-        Signal.trap('PIPE', 'IGNORE')
+        Signal.trap('PIPE', proc { })
         max_reqs = self._calc_reqs_per_child()
         while proc_req_count < max_reqs
           @can_exit = true
           connection = @server.accept
           begin
-            connection.nonblock(true) {
-              peeraddr = nil
-              peerport = 0
-              if @_is_tcp then
-                connection.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-                peer = connection.peeraddr
-                peeraddr = peer[2],
-                peerport = peer[1].to_s
-              end
-              proc_req_count += 1
-              @_is_deferred_accept = @_using_defer_accept
-              env = {
-                'SERVER_NAME' => @options[:Host],
-                'SERVER_PORT' => @options[:Port].to_s,
-                'REMOTE_ADDR' => peeraddr,
-                'REMOTE_PORT' => peerport,
-                'rack.version' => [0,1],
-                'rack.errors' => STDERR,
-                'rack.multithread' => false,
-                'rack.multiprocess' => false,
-                'rack.run_once' => false,
-                'rack.url_scheme' => 'http'
-              }
-              self.handle_connection(env, connection, app)
+            connection.nonblock = true
+            peeraddr = nil
+            peerport = 0
+            if @_is_tcp then
+              connection.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+              peer = connection.peeraddr
+              peeraddr = peer[2]
+              peerport = peer[1].to_s
+            end
+            proc_req_count += 1
+            @_is_deferred_accept = @_using_defer_accept
+            env = {
+              'SERVER_NAME' => @options[:Host],
+              'SERVER_PORT' => @options[:Port].to_s,
+              'REMOTE_ADDR' => peeraddr,
+              'REMOTE_PORT' => peerport,
+              'rack.version' => [0,1],
+              'rack.errors' => STDERR,
+              'rack.multithread' => false,
+              'rack.multiprocess' => false,
+              'rack.run_once' => false,
+              'rack.url_scheme' => 'http'
             }
+            self.handle_connection(env, connection, app)
           ensure
             connection.close
           end
         end
       end
-
       def handle_connection(env, connection, app)
         buf = ""
         while true
@@ -222,12 +219,27 @@ module Rack
             end
             status, header, body = app.call(env)
             res_header = "HTTP/1.0 "+status.to_s+" "+Rack::Utils::HTTP_STATUS_CODES[status]+"\r\nConnection: close\r\n"
+            sent_date = false
+            sent_server = false
             header.each do |k,vs|
-              if k.downcase == "connection" then
+              dk = k.downcase
+              if dk == "connection" then
                 next
               end
+              if dk == "date" then
+                sent_date = true
+              end
+              if dk == "server" then
+                sent_server = true
+              end
               res_header += k + ": " + vs + "\r\n"
             end
+            if !sent_date then
+              res_header += "Date: " + Time.now.httpdate + "\r\n"
+            end
+            if !sent_server then
+              res_header += "Server: RubyStarlet\r\n"
+            end
             res_header += "\r\n"
             if body.length == 1 && body[0].bytesize < 40960 then
               ret = self.write_all(connection,res_header+body[0])

data/lib/prefork_engine.rb

@@ -24,13 +24,13 @@ class PreforkEngine
     @_no_adjust_until = 0.0
     @in_child = false
     @worker_pids = {}
-    @trap_action = {}
+    @delayed_task = nil
     @options["trap_signals"].each do |k,kv|
-      @trap_action[k] = Signal.trap(k) { |signo|
+      Signal.trap(k) { |signo|
         @signal_received = Signal.signame(signo)
       }
     end
-    @trap_action["CHLD"] = Signal.trap("CHLD") {
+    Signal.trap("CHLD") {
       #do nothing
     }
   end
@@ -42,7 +42,7 @@ class PreforkEngine
     raise "cannot start another process while you are in child process" if @in_child
 
     # main loop
-    while @signal_received.size == 0
+    while @signal_received.length == 0
       action = self._decide_action() if @_no_adjust_until <= Time.now.to_f
       if action > 0 then
         # start a new worker
@@ -61,10 +61,11 @@ class PreforkEngine
           if pid == nil then
             @in_child = true
             @options["trap_signals"].each do |k,kv|
-              Signal.trap(k, 0) #XXX ??
+              ## Signal.trap(k, 0) #XXX in rspec only?
+              Signal.trap(k, "DEFAULT")
             end
-            Signal.trap("CHLD", 0) #XXX ??
-            exit!(true) if @signal_received.size > 0
+            ## Signal.trap("CHLD", 0) #XXX in rspec only?
+            Signal.trap("CHLD", "DEFAULT")
             block.call
             exit!(true)
           end
@@ -75,11 +76,9 @@ class PreforkEngine
           @worker_pids[pid] = @generation
           self._update_spawn_delay(@options["spawn_interval"])
       end
-      if res = self._wait() then
-        exit_pid = res[0]
-        status = res[1]
-        self._on_child_reap(exit_pid, status)
-        if @worker_pids.delete(exit_pid) == @generation && status != 0 then
+      if r = self._wait() then
+        self._on_child_reap(r.pid, r.status)
+        if @worker_pids.delete(r.pid) == @generation && r.status != 0 then
           self._update_spawn_delay(@options["err_respawn_interval"])
         end
       end
@@ -150,9 +149,9 @@ class PreforkEngine
   def wait_all_children
     #XXX todo timeout
     while !@worker_pids.keys.empty?
-      if res = self._wait() then
-        if @worker_pids.delete(res[0]) then
-          self._on_child_reap(res[0],$?.exitstatus)
+      if r = self._wait() then
+        if @worker_pids.delete(r.pid) then
+          self._on_child_reap(r.pid, r.status)
         end
       end
     end

data/lib/prefork_engine/version.rb

@@ -1,3 +1,3 @@
 class PreforkEngine
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/05_before_after_fork_spec.rb

@@ -1,29 +1,30 @@
 require 'spec_helper'
 
+i = 0
+j = 0
+pm = PreforkEngine.new(
+  "max_workers" => 3,
+  "trap_signals" => {
+    "TERM" => "TERM",
+  },
+  "before_fork" => proc { |pm2|
+    i += 1
+  },
+  "after_fork" => proc { |pm3|
+    j += 1
+  }
+)
+while pm.signal_received != "TERM"
+  pm.start {
+    if i == 10 then
+      Process.kill("TERM", pm.manager_pid)
+    end
+  }
+end
+pm.wait_all_children()
+
 describe PreforkEngine do
   it 'before_after_fork' do
-    i = 0
-    j = 0
-    pm = PreforkEngine.new(
-      "max_workers" => 3,
-      "trap_signals" => {
-         "TERM" => "TERM",
-      },
-      "before_fork" => proc { |pm2|
-        i += 1
-      },
-      "after_fork" => proc { |pm3|
-        j += 1
-      }
-    )
-    while pm.signal_received != "TERM"
-      pm.start {
-        if i == 10 then
-          Process.kill("TERM", pm.manager_pid)
-        end
-      }
-    end
-    pm.wait_all_children()
     expect(i).to be >= 10
     expect(j).to be >= 10
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefork_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler