parallel_server 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60f22791a70556733877e1abacd86ffc257fafd6
-  data.tar.gz: 66d5e90cdca52f41dc687cd160e54b8fb030f858
+  metadata.gz: 3e573247856ff0b1b989e0b9d0a2dfd978569c92
+  data.tar.gz: 1b7ca5892398cbf62054e76d85ff8bfcd0ebeb9d
 SHA512:
-  metadata.gz: 0d8e13cf7f83e1581706c0013f03e46cdec97490c9d2a13345fca178212201570d6b7836772555d7b8cb8b6ed1a6051a4f41985fe01d0a066bd5218dcb02a79b
-  data.tar.gz: 27f616dc7eab3d89a42faf45a48f3d2b9596ba43783855d19f8840b18675fa93ff8991961f15b735ec470423a8d3649a06b8c7e38c12e0227d2df711ed6bbeb6
+  metadata.gz: c91dbe33714e7024319967d498d809e7aa04a4108e18278652f4cdc0d6b2e9a30db47dd9bd4d6e2a04c51c4d625c6ce819c4da65d84d451c4cea6e53e75e56e6
+  data.tar.gz: 153deed61dd5f939736c4f9d51a30a9ceab806d7e5d6ebb7469c0b498c7e3e8b458df49a206e5363ca70e2d241724276fbfc6ca70082c0aded59f55e30a71de4

data/README.md

@@ -25,6 +25,8 @@ end
 
 * `ParallelServer::Prefork.new(port, opts={})`
 * `ParallelServer::Prefork.new(host, port, opts={})`
+* `ParallelServer::Prefork.new(socket, opts={})`
+* `ParallelServer::Prefork.new([socket, ...], opts={})`
 
 #### host
 
@@ -33,6 +35,9 @@ end
 #### port
 待ち受けるTCPポート番号。
 
+### socket
+待ち受ける Socket オブジェクト。
+
 #### opts
 
 ParallelServer::Prefork の動作を設定するパラメータ。

data/lib/parallel_server/prefork.rb

@@ -13,8 +13,6 @@ module ParallelServer
     attr_reader :child_status
 
     # @!macro [new] args
-    #   @param host [String] hostname or IP address
-    #   @param port [Integer / String] port number / service name
     #   @param opts [Hash] options
     #   @option opts [Integer] :min_processes (5) minimum processes
     #   @option opts [Integer] :max_processes (20) maximum processes
@@ -29,16 +27,24 @@ module ParallelServer
     #   @option opts [#call] :on_child_exit (nil) object#call(pid, status) is invoked when child process exit. This is call in parent process.
 
     # @overload initialize(host=nil, port, opts={})
-    #   @!macro args
+    #   @param host [String] hostname or IP address
+    #   @param port [Integer / String] port number / service name
+    #   @macro args
+    # @overload initialize(socket, opts={})
+    #   @param socket [Socket] listening socket
+    #   @macro args
+    # @overload initialize(sockets, opts={})
+    #   @param sockets [Array<Socket>] listening sockets
+    #   @macro args
     def initialize(*args)
-      host, port, opts = parse_args(*args)
-      @host, @port, @opts = host, port, opts
+      @sockets, @host, @port, @opts = parse_args(*args)
       set_variables_from_opts
       @from_child = {}             # IO(r) => pid
       @to_child = {}               # IO(r) => IO(w)
       @child_status = {}           # IO(r) => Hash
       @children = []               # pid
       @loop = true
+      @sockets_created = false
     end
 
     # @return [void]
@@ -49,8 +55,11 @@ module ParallelServer
     def start(&block)
       raise 'block required' unless block
       @block = block
-      @sockets = Socket.tcp_server_sockets(@host, @port)
-      @sockets.each{|s| s.listen(@listen_backlog)} if @listen_backlog
+      unless @sockets
+        @sockets = Socket.tcp_server_sockets(@host, @port)
+        @sockets.each{|s| s.listen(@listen_backlog)} if @listen_backlog
+        @sockets_created = true
+      end
       @reload_args = nil
       while @loop
         do_reload if @reload_args
@@ -58,13 +67,21 @@ module ParallelServer
         adjust_children
       end
     ensure
-      @sockets.each{|s| s.close rescue nil} if @sockets
+      @sockets.each{|s| s.close rescue nil} if @sockets && @sockets_created
       @to_child.values.each{|s| s.close rescue nil}
       @to_child.clear
       Timeout.timeout(1){wait_all_children} rescue Thread.new{wait_all_children}
     end
 
     # @overload reload(host=nil, port, opts={})
+    #   @param host [String] hostname or IP address
+    #   @param port [Integer / String] port number / service name
+    #   @macro args
+    # @overload reload(socket, opts={})
+    #   @param socket [Socket] listening socket
+    #   @macro args
+    # @overload reload(sockets, opts={})
+    #   @param sockets [Array<Socket>] listening sockets
     #   @macro args
     # @return [void]
     def reload(*args)
@@ -86,20 +103,25 @@ module ParallelServer
 
     # @return [void]
     def do_reload
-      host, port, @opts = @reload_args
+      sockets, host, port, @opts = @reload_args
       @reload_args = nil
       old_listen_backlog = @listen_backlog
       set_variables_from_opts
 
       address_changed = false
       if @host != host || @port != port
-        @host, @port = host, port
-        @sockets.each(&:close)
-        @sockets = Socket.tcp_server_sockets(@host, @port)
-        @sockets.each{|s| s.listen(@listen_backlog)} if @listen_backlog
+        @sockets.each(&:close) if @sockets_created
+        @sockets, @host, @port = sockets, host, port
+        if @sockets
+          @sockets_created = false
+        else
+          @sockets = Socket.tcp_server_sockets(@host, @port)
+          @sockets.each{|s| s.listen(@listen_backlog)} if @listen_backlog
+          @sockets_created = true
+        end
         address_changed = true
       elsif @listen_backlog != old_listen_backlog
-        @sockets.each{|s| s.listen(@listen_backlog)} if @listen_backlog
+        @sockets.each{|s| s.listen(@listen_backlog)} if @listen_backlog && @sockets_created
       end
 
       reload_children(address_changed)
@@ -143,8 +165,17 @@ module ParallelServer
     end
 
     # @overload parse_args(host=nil, port, opts={})
+    #   @param host [String] hostname or IP address
+    #   @param port [Integer / String] port number / service name
     #   @macro args
-    # @return [Array<String, String, Hash>] hostname, port, option
+    # @overload parse_args(socket, opts={})
+    #   @param socket [Socket] listening socket
+    #   @macro args
+    # @overload parse_args(sockets, opts={})
+    #   @param sockets [Array<Socket>] listening sockets
+    #   @macro args
+    # @return [Array<Array<Socket>, String, String, Hash>] sockets, hostname, port, option.
+    #   either sockets or (hostname & port) is available.
     def parse_args(*args)
       opts = {}
       arg_count = args.size
@@ -152,13 +183,18 @@ module ParallelServer
         opts = args.pop
       end
       if args.size == 1
-        host, port = nil, args.first
+        case args.first
+        when Integer, String
+          host, port = nil, args.first
+        else
+          sockets = [args.first].flatten
+        end
       elsif args.size == 2
         host, port = args
       else
         raise ArgumentError, "wrong number of arguments (#{arg_count} for 1..3)"
       end
-      return host, port, opts
+      return sockets, host, port, opts
     end
 
     # @return [Integer]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_server
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tomita Masahiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies: []
 description: Parallel TCP Server library. This is easy to make Multi-Process / Multi-Thread
   server
@@ -45,3 +45,4 @@ signing_key:
 specification_version: 4
 summary: Parallel TCP Server library
 test_files: []
+has_rdoc: true