rhebok 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62de5b0358298e1e28e289b07234b31d1f7ecd45
-  data.tar.gz: 9e1abac8fe69c3876717ef143c3c4f2e5ba8a065
+  metadata.gz: 6f7b4d1269e51f01608ce10b664cbac7a48ab183
+  data.tar.gz: 63d4f869951c560a78b4878744b939e8ee40004c
 SHA512:
-  metadata.gz: 67a54bf9fb0820178c01a5a9c60678ce40883f3c47d02ceb4ab8e3bf75c9bd3edf9e77b3e03e86032f0b296fefc42807eecd94beb56e2a5a6fb883bc6a2e9dfa
-  data.tar.gz: 04b4648772b4e6fb723786337c10cdab5170d5357002eef7aa9b1ce6555354f15b33680fd3f88f0748c9612ab691e2b50741efbe4aa063af470d1587c2808833
+  metadata.gz: f1954f4c61f6f593af6d057d799d1c0568c7d978e21eb72fd0c90cba4effa0c4d12c6d2273e69dd2ebe87c9d29610b9af4c9a285175120ea5c41a5a95706d705
+  data.tar.gz: 9fe22db2f5b0e3f311b6321f28325d3f60dbba146c2d4873f338c165c13c4b582df97c693392bfc0aabbb17c3b38f3f25175e1ff1e5845e33ec26b79cf5c27e2

data/Changes

@@ -1,3 +1,7 @@
+0.0.7 2014-12-24T16:25:22Z
+
+    - support unix domain socket directly
+
 0.0.6 2014-12-24T13:19:50Z
 
     - support OobGC
@@ -23,3 +27,4 @@
 
     - first release
 
+

data/README.md

@@ -10,7 +10,7 @@ Rhebok supports following features.
 - uses accept4(2) if OS support
 - uses writev(2) for output responses
 - prefork and graceful shutdown using prefork_engine
-- hot deploy and unix domain socket using start_server
+- hot deploy using start_server
 - only supports HTTP/1.0. But does not support Keepalive.
 - supports OobGC
 
@@ -69,6 +69,14 @@ hostname or ip address to bind (default: 0.0.0.0)
 
 port to bind (default: 9292)
 
+### Path
+
+path to listen using unix socket
+
+### BackLog
+
+specifies a listen backlog parameter
+
 ### MaxWorkers
 
 number of worker processes (default: 10)

data/lib/rack/handler/rhebok.rb

@@ -25,6 +25,7 @@ module Rack
       DEFAULT_OPTIONS = {
         :Host => '0.0.0.0',
         :Port => 9292,
+        :Path => nil,
         :MaxWorkers => 10,
         :Timeout => 300,
         :MaxRequestPerChild => 1000,
@@ -34,6 +35,7 @@ module Rack
         :OobGC => false,
         :MaxGCPerRequest => 5,
         :MinGCPerRequest => nil,
+        :BackLog => nil,
       }
       NULLIO  = StringIO.new("").set_encoding('BINARY')
 
@@ -55,7 +57,6 @@ module Rack
           options[:OobGC] = options[:OobGC].match(/^(true|yes|1)$/i) ? true : false
         end
         @options = DEFAULT_OPTIONS.merge(options)
-        p @options[:OobGC]
         @server = nil
         @_is_tcp = false
         @_using_defer_accept = false
@@ -75,10 +76,32 @@ module Rack
         end
 
         if @server == nil
-          puts "Rhebok starts Listening on #{@options[:Host]}:#{@options[:Port]} Pid:#{$$}"
-          @server = TCPServer.new(@options[:Host], @options[:Port])
-          @server.setsockopt(:SOCKET, :REUSEADDR, 1)
-          @_is_tcp = true
+          if @options[:Path] != nil
+            if ::File.socket?(@options[:Path])
+              puts "removing existing socket file:#{@options[:Path]}";
+              ::File.unlink(@options[:Path])
+            end
+            begin
+              ::File.unlink(@options[:Path])
+            rescue
+              #ignore
+            end
+            puts "Rhebok starts Listening on :unix:#{@options[:Path]} Pid:#{$$}"
+            oldmask = ::File.umask(0)
+            @server = UNIXServer.open(@options[:Path])
+            ::File.umask(oldmask)
+            @_is_tcp = false
+            @options[:Host] = "0.0.0.0"
+            @options[:Port] = 0
+          else
+            puts "Rhebok starts Listening on #{@options[:Host]}:#{@options[:Port]} Pid:#{$$}"
+            @server = TCPServer.open(@options[:Host], @options[:Port])
+            @server.setsockopt(:SOCKET, :REUSEADDR, 1)
+            @_is_tcp = true
+          end
+          if @options[:BackLog] != nil
+            @server.listen(@options[:BackLog].to_i)
+          end
         end
 
         if RUBY_PLATFORM.match(/linux/) && @_is_tcp == true

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/rhebok.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "bacon"
-  spec.add_dependency "rack", "~> 1.5.2"
-  spec.add_dependency "prefork_engine", "~> 0.0.4"
+  spec.add_dependency "rack", ">= 1.5.0"
+  spec.add_dependency "prefork_engine", ">= 0.0.4"
 
   # get an array of submodule dirs by executing 'pwd' inside each submodule
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|

data/test/spec_03_unix.rb

@@ -0,0 +1,46 @@
+require 'rack'
+require File.expand_path('../testrequest', __FILE__)
+require 'timeout'
+require 'socket'
+require 'rack/handler/rhebok'
+
+describe Rhebok do
+  extend TestRequest::Helpers
+  begin
+
+    @path = "/tmp/app_spec_03_unix.sock"
+    @app = Rack::Lint.new(TestRequest.new)
+    @pid = fork
+    if @pid == nil
+      #child
+      Rack::Handler::Rhebok.run(@app, :Path=>@path, :MaxWorkers=>1)
+      exit!(true)
+    end
+    sleep 1
+
+    c = UNIXSocket.open(@path)
+    c.write("GET / HTTP/1.0\r\n\r\n");
+    outbuf = ""
+    c.read(nil,outbuf)
+    header,body = outbuf.split(/\r\n\r\n/,2)
+    response = YAML.load(body)
+
+    should "unix domain" do
+      header.should.not.be.nil
+      response["rack.version"].should.equal [1,1]
+      response["rack.url_scheme"].should.equal "http"
+      response["SERVER_NAME"].should.equal "0.0.0.0"
+      response["SERVER_PORT"].should.equal "0"
+      response["REMOTE_ADDR"].should.equal ""
+      response["REMOTE_PORT"].should.equal "0"
+    end
+
+  ensure
+    sleep 1
+    if @pid != nil
+      Process.kill(:TERM, @pid)
+      Process.wait()
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Masahiro Nagano
@@ -56,28 +56,28 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: prefork_engine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
 description: High Performance and Optimized Preforked Rack Handler
@@ -111,8 +111,9 @@ files:
 - lib/rhebok.rb
 - lib/rhebok/version.rb
 - rhebok.gemspec
-- test/spec_02_basic.rb
+- test/spec_01_basic.rb
 - test/spec_02_server.rb
+- test/spec_03_unix.rb
 - test/testrequest.rb
 homepage: https://github.com/kazeburo/rhebok
 licenses:
@@ -139,6 +140,7 @@ signing_key:
 specification_version: 4
 summary: High Performance Preforked Rack Handler
 test_files:
-- test/spec_02_basic.rb
+- test/spec_01_basic.rb
 - test/spec_02_server.rb
+- test/spec_03_unix.rb
 - test/testrequest.rb