reifier 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f44cae18b405a8793f34980692b85438987551d7
-  data.tar.gz: 8dad6a8d76982c62fe8ef97bff274c130c7fd310
+  metadata.gz: b29d21d3efe5c6cd139af6449af8657d3f9d0b84
+  data.tar.gz: 902c73060ba214bb356815e9f2929d88e601b813
 SHA512:
-  metadata.gz: e7c3111aef5ed045e12b832778d60eadbff4783dd99f6e00f1ac98f060d71f6e35e6e32f4f35cbb8e3abc1443203e2b033039119b0cea4a2151456af30d19575
-  data.tar.gz: 24be8d505dc28cc4c594f4d40c90a6aae43b2da86c5545d842240074662f374a40a186f13c819994129eadd9b00a5a264fa94072c3142575088fe7a1794239eb
+  metadata.gz: d7ca642a2d5805356f90afcb4d6a961506ed78457602545c840ee93ded772a286886183569fcc2ecec1b949206607953c8b454f4deb0be918bf3e0432440fe99
+  data.tar.gz: adb27c166f7f22437ee134894a02243f61abbaa0afb2fb99069788758abb967390659fda263d915bfa59bb6aa6fd1216aea3fc6492f2ad83b7311f3b1e4f1261

data/examples/reifier.rb

@@ -1,2 +1,2 @@
-threads 8, 16 # Using a thread pool size of 8
+threads 8, 16 # Using a thread pool min size of 8 and max size of 16
 workers 9 # Using 9 worker processes

data/lib/rack/handler/reifier.rb

@@ -5,7 +5,6 @@ module Rack
   module Handler
     module Reifier
       DEFAULT_OPTIONS = {
-        Workers: 1,
         MinThreads: 0,
         MaxThreads: 16
       }.freeze
@@ -22,7 +21,7 @@ module Rack
         {
           'MinThreads=MINTHREADS' => 'Number of minimal threads (default: 0)',
           'MaxThreads=MAXTHREADS' => 'Number of minimal threads (default: 16)',
-          'Workers=WORKERS' => 'Number of workers (default: 1)'
+          'Workers=WORKERS'       => 'Number of workers (default: none)'
         }
       end
     end

data/lib/reifier/server.rb

@@ -28,9 +28,40 @@ module Reifier
     def start
       server = TCPServer.new(@options[:Host], @options[:Port])
 
+      puts "# Ruby version: #{RUBY_VERSION}"
+      puts "# Min threads: #{@options[:MinThreads]}, max threads: #{@options[:MaxThreads]}"
+      puts "# Environment: #{@options[:environment]}"
+      puts "# Master PID: #{Process.pid}"
+      puts "# Listening on tcp://#{server.addr.last}:#{@options[:Port]}"
+
+      if @options[:Workers]
+        start_clustered(server)
+      else
+        start_single(server)
+      end
+    end
+
+    private
+
+    def start_single(server)
+      puts '# Started in single mode'
+      start!(server)
+    end
+
+    def start_clustered(server)
+      puts '# Started in clustered mode'
       child_pids = []
-      @options[:Workers].to_i.times do
-        child_pids << spawn_worker(server)
+
+      puts '# ================================'
+      puts "# Spinning up #{@options[:Workers].to_i} Workers"
+      @options[:Workers].to_i.times do |i|
+        pid = fork do
+          start!(server)
+        end
+
+        puts "# Worker #{i} started with pid: #{pid}"
+
+        child_pids << pid
       end
 
       Signal.trap 'SIGINT' do
@@ -45,23 +76,15 @@ module Reifier
         exit
       end
 
-      puts "# Ruby version: #{RUBY_VERSION}"
-      puts "# Min threads: #{@options[:MinThreads]}, max threads: #{@options[:MaxThreads]}"
-      puts "# Environment: #{@options[:environment]}"
-      puts "# Number of Workers used: #{@options[:Workers]}"
-      puts "# Master PID: #{Process.pid}"
-      puts "# Listening on tcp://#{server.addr.last}:#{@options[:Port]}"
-
       loop do
         pid = Process.wait
         STDERR.puts "Process #{pid} crashed"
 
         child_pids.delete(pid)
-        child_pids << spawn_worker
+        child_pids << spawn_worker(server)
       end
     end
 
-    private
 
     def threads(min, max)
       @options[:MinThreads] = min
@@ -72,50 +95,40 @@ module Reifier
       @options[:Workers] = count
     end
 
-    def spawn_worker(server)
-      fork do
-        pool = Concurrent::ThreadPoolExecutor.new(
-          min_threads:     @options[:MinThreads],
-          max_threads:     @options[:MaxThreads],
-          max_queue:       0,
-          fallback_policy: :caller_runs,
-        )
-
-        # Signal.trap 'SIGINT' do
-        #   puts "Shutting down thread pool in Worker: #{Process.pid}"
-        #   pool.shutdown
-        #   pool.wait_for_termination
-
-        #   exit
-        # end
-
-        loop do
-          socket = server.accept
-          socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-
-          Concurrent::Future.new(executor: pool) do
-            begin
-              request  = Request.new(socket, @options)
-              response = Response.new(socket)
-
-              request.handle
-
-              response.protocol = request.protocol
-              response << @app.call(request.rack_env)
-
-              response.handle
-            rescue EOFError
-              # nothing, shit happens
-            rescue Exception => e
-              socket.close
-
-              STDERR.puts ERROR_HEADER
-              STDERR.puts "#{e.class}: #{e}"
-              STDERR.puts e.backtrace
-              STDERR.puts ERROR_FOOTER
-            end
-          end.execute
-        end
+    def start!(server)
+      pool = Concurrent::ThreadPoolExecutor.new(
+        min_threads:     @options[:MinThreads],
+        max_threads:     @options[:MaxThreads],
+        max_queue:       0,
+        fallback_policy: :caller_runs,
+      )
+
+      loop do
+        socket = server.accept
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+        Concurrent::Future.new(executor: pool) do
+          begin
+            request  = Request.new(socket, @options)
+            response = Response.new(socket)
+
+            request.handle
+
+            response.protocol = request.protocol
+            response << @app.call(request.rack_env)
+
+            response.handle
+          rescue EOFError
+            # nothing, shit happens
+          rescue Exception => e
+            socket.close
+
+            STDERR.puts ERROR_HEADER
+            STDERR.puts "#{e.class}: #{e}"
+            STDERR.puts e.backtrace
+            STDERR.puts ERROR_FOOTER
+          end
+        end.execute
       end
     end
   end

data/lib/reifier/version.rb

@@ -1,3 +1,3 @@
 module Reifier
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reifier
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Benny Klotz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby