waitress-core 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61bec41dd394be9dd6aa5baff4d186c31c43d6e3
-  data.tar.gz: f4e11e40a4b50397c7db4d58a8b29872c520d5d3
+  metadata.gz: 53fac76668e1321e024fed8489d1e3bcf80075e2
+  data.tar.gz: 8cc2c10b4661f3c42a5432eda9504691d1d47bf0
 SHA512:
-  metadata.gz: 1848048ee5ddecd831b8c3c4e2339762e0a0e1e49c5846087115487d72d42dde4d390fdc18a9511b50e5499dc2cfaf03b7c442673fe611835d89e3eb43517565
-  data.tar.gz: bd2b4cc0aae4ad4a1127a600597af570d593f4f217894bc6a6e2a18c197876843837473dd8145853bd042b3a6f8de333cc5f58129eaa23d5e52bc02303f86795
+  metadata.gz: efb9647f241a506830c1a69f18869e2fcc7b67d8dc092ce0b14512445773fb2e8118a9c3c2ad8809e892f48f176588e32e8e510ef6e9aaaa30c73ec44ca2bb08
+  data.tar.gz: fc393bf48cdebecbadc08d8a1dc3ec998443c3ebeb00242065a0bb5c0e03b65f45f670f92c389c8370cfc17d6f1e3f1922fb99d5c3dd2f27286a7c070ff233b0

data/lib/waitress.rb

@@ -25,6 +25,13 @@ require 'fileutils'
 # classes and utilities created by Waitress
 module Waitress
 
+  SERVERS = []
+
+  at_exit do
+    SERVERS.each { |x| x.killall }
+    exit
+  end
+
   # Create a new Waitress Server, or, in case of the Filesystem, create a Configuration
   # for a set of Servers
   # Params:

data/lib/waitress/configure.rb

@@ -27,6 +27,7 @@ module Waitress
       @servers = @configurations.map do |conf|
         s = Waitress::HttpServer.new
         conf.hosts.each { |h| s << h }
+        s.set_processes conf.processes
         s.ports *conf.ports
         s
       end
@@ -82,11 +83,15 @@ module Waitress
 
     attr_accessor :hosts
     attr_accessor :ports
+    attr_accessor :processes
 
     def initialize configure, *ports
       @ports = *ports
       @hosts = []
       @configure = configure
+
+      @processes = 10
+      @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
     end
 
     # Create a new VirtualHost with the given regex, priority, and configure it
@@ -101,7 +106,7 @@ module Waitress
 
     # Over all the registered VHosts, call this method. Use this to configure
     # a similar setting for all vhosts at once instead of duplicating code
-    # across all of them. 
+    # across all of them.
     def all_hosts &block
       @hosts.each { |h| block.call(h) }
     end

data/lib/waitress/response.rb

@@ -96,7 +96,8 @@ module Waitress
           end
         end
         done
-        sock.close
+        sock.close rescue nil
+        @io.close rescue nil
       end
     end
 

data/lib/waitress/server.rb

@@ -12,11 +12,22 @@ module Waitress
       attr_accessor :http_body
     end
 
+    attr_accessor :processes
+
     # Create a new Server instance with the given ports. If no ports are given,
     # port 80 will be used as a default
     def initialize(*ports)
+      Waitress::SERVERS << self
       ports << 80 if ports.length == 0
       @ports = ports
+      @processes = 10
+      @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
+      @running_processes = []
+    end
+
+    # Set the amount of concurrent Waitress Processes to run on this Server, per Port
+    def set_processes count
+      @processes = count
     end
 
     # Set or Get the ports for this server. If arguments are provided, the ports
@@ -32,16 +43,25 @@ module Waitress
     # set (or 80 for the default)
     def run *ports
       @ports = ports unless ports.length == 0
-      @threads = @ports.map { |x| Thread.new { launch_port x } }
       self.each do |vhost|
         vhost.on_server_start self
       end
+
+      @running_processes = @ports.map do |port|
+        launch_port(port)
+      end
+      @running_processes.flatten!
       self
     end
 
+    # Killall running processes
+    def killall
+      @running_processes.each { |x| x.kill }
+    end
+
     # Join the server, blocking the current thread in order to keep the server alive.
     def join
-      @threads.each { |x| x.join }
+      @running_processes.each { |x| x.wait }
     end
 
     # Handle a client based on an IO stream, if you plan to serve on a non-socket
@@ -52,48 +72,54 @@ module Waitress
 
   :private
     def launch_port port
-      @server = TCPServer.new port
-      while true
-        client = @server.accept
-        go do
-          begin
-            handle_client client
-          rescue => e
-            puts "Server Error: #{e} (Fix This!)"
-            puts e.backtrace
+      serv = TCPServer.new port
+      processes = []
+      @processes.times do
+        processes << gofork {
+          while true
+            begin
+              client = serv.accept
+              handle_client client
+            rescue => e
+              puts "Server Error: #{e} (Fix This!)"
+              puts e.backtrace
+              client.close rescue nil
+            end
           end
-        end
+        }
       end
+      processes
     end
 
     def handle_client client_socket
-      gofork do
-        begin
-          data = client_socket.readpartial(8192)
-          nparsed = 0
-
-          parser = Waitress::HttpParser.new
-          params = HttpParams.new
-
-          while nparsed < data.length
-            nparsed = parser.execute(params, data, nparsed)
-            if parser.finished?
-              build_request params, client_socket
-            else
-              ch = client.readpartial(8192)
-              break if !ch or ch.length == 0
-
-              data << ch
-            end
+      # pro = gofork do
+      begin
+        data = client_socket.readpartial(8192)
+        nparsed = 0
+
+        parser = Waitress::HttpParser.new
+        params = HttpParams.new
+
+        while nparsed < data.length
+          nparsed = parser.execute(params, data, nparsed)
+          if parser.finished?
+            build_request params, client_socket
+          else
+            ch = client.readpartial(8192)
+            break if !ch or ch.length == 0
+
+            data << ch
           end
-        rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL, Errno::EBADF
-          client_socket.close rescue nil
-        rescue => e
-          puts "Client Error: #{e}"
-          puts e.backtrace
         end
-      end.wait
-      client_socket.close unless client_socket.closed?
+      rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL, Errno::EBADF
+        client_socket.close rescue nil
+      rescue => e
+        puts "Client Error: #{e}"
+        puts e.backtrace
+      end
+      # end
+      client_socket.close rescue nil
+      # pro.wait
     end
 
     def build_request headers, client_socket

data/lib/waitress/version.rb

@@ -1,3 +1,3 @@
 module Waitress
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waitress-core
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Jaci Brunning