reifier 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c728b806deb19da5dcfa300f0a686b0981d369d8
-  data.tar.gz: 8f9b2057ca56169779e32e71037f12df61bacd4c
+  metadata.gz: aa60f4a229669e2c71cccd301f93309a67fa48d6
+  data.tar.gz: 731f667e0829f067924abbf80ed8d4f5e88f559c
 SHA512:
-  metadata.gz: b63257d7a6c23bfaadddfa3e0f11e9905d8ce5c0059ef7444db6259f62591076f8a1f240fe49fa0c326411eb9db99c84f3bc68454c186b0505b798c56e50a231
-  data.tar.gz: 0717702206a003c2749e7dd018928a3ad68a71635e78e1300ba18396762a38c7f1dc9128c83dd9efe5a036ee0e7aba556e9ef0e99a96277974b5e9f3b73dc321
+  metadata.gz: 167c3dff17ad61c8fa5a5be610939603df0516d61eedf96e1d3545ae3bf13701c60ba8a554f4eaf34a9685d37550707e76c649eb859e6d7ec9e6eed4495143d2
+  data.tar.gz: b04ce039f7d7a1a86589f3fecc8514d28a09a4ebbab06ddab4a3b3956ea9c292a21bbb17d2e387e29c1bd740e03b57cbdb266ad1927b5db452976980bd55e8c5

data/README.md

@@ -6,9 +6,11 @@ reify
 
 (transitive) to consider or make (an abstract idea or concept) real or concrete
 
+Reifier is a threaded and pre forked rack app server written in pure ruby.
+
 ## Is it any good?
 
-[Yes](http://news.ycombinator.com/item?id=3067434), no really just a fun project use it in production when u want :P
+[Yes](http://news.ycombinator.com/item?id=3067434), no really just a fun project use it in production if you want :P
 
 ## Y u no benchmark?!
 
@@ -39,7 +41,7 @@ Use it through rackup:
 
 ## Available Options
 
-You can adapt the ThreadPool sized with following option:
+You can adapt the ThreadPool size with following option:
 
     $ rackup -s reifier -O Threads=8
 
@@ -47,6 +49,16 @@ Also the amount of workers is adaptable:
 
     $ rackup -s reifier -O Workers=5
 
+## Config File
+
+You can also use a config file for these and more settings.
+
+When you are using `rails s` reifier tries to load the file from `Rails.root/config/reifier.rb`
+
+When you are using any other rack app it tries to load the file from `Dir.pwd/config/reifier.rb`
+
+See the [example config](examples/reifier.rb)
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/examples/reifier.rb

@@ -0,0 +1,2 @@
+threads 8 # Using a thread pool size of 8
+workers 9 # Using 9 worker processes

data/lib/rack/handler/reifier.rb

@@ -5,20 +5,22 @@ module Rack
   module Handler
     module Reifier
       DEFAULT_OPTIONS = {
-        Workers: 3,
+        Workers: 1,
         Threads: 16
       }.freeze
 
       def self.run(app, options = {})
         options = DEFAULT_OPTIONS.merge(options)
-        puts "Reifier #{::Reifier::VERSION} starting.."
+        puts "======= Reifier #{::Reifier::VERSION} starting ======="
         server = ::Reifier::Server.new(app, options)
+        server.load_configuration
         server.start
       end
 
       def self.valid_options
         {
-          'Threads=THREADS' => 'Number of threads (default: 5)'
+          'Threads=THREADS' => 'Number of threads (default: 16)',
+          'Workers=WORKERS' => 'Number of workers (default: 1)'
         }
       end
     end

data/lib/reifier/request.rb

@@ -2,16 +2,17 @@ module Reifier
   class Request
     attr_reader :request_method, :request_path, :protocol, :request_uri
 
-    def initialize(options)
+    def initialize(socket, options)
+      @socket  = socket
       @body    = StringIO.new('')
       @options = options
     end
 
-    def handle(socket)
-      handle_request_line(socket)
-      handle_headers(socket)
+    def handle
+      handle_request_line
+      handle_headers
 
-      handle_body(socket) if request_with_body?
+      handle_body if request_with_body?
     end
 
     def rack_env
@@ -34,7 +35,9 @@ module Reifier
         'SERVER_PROTOCOL'      => @protocol,
         'SERVER_SOFTWARE'      => "Reifier #{Reifier::VERSION}",
         'SERVER_NAME'          => @options[:Host],
-        'SERVER_PORT'          => @options[:Port].to_s
+        'SERVER_PORT'          => @options[:Port].to_s,
+        'HTTP_VERSION'         => @protocol,
+        'REMOTE_ADDR'          => @socket.addr.last
       }
 
       @headers.each do |k, v|
@@ -52,12 +55,12 @@ module Reifier
 
     private
 
-    def handle_request_line(socket)
+    def handle_request_line
       # It is possible that gets returns nil
       # "Returns nil if called at end of file" see http://ruby-doc.org/core-2.3.0/IO.html#method-i-gets
-      request_line = socket.gets
+      request_line = @socket.gets
       raise EOFError unless request_line
-      raise HTTPParseError unless request_line.include?('HTTP')
+      raise HTTPParseError, "Received #{request_line.inspect}" unless request_line.include?('HTTP')
 
       request_line_array = request_line.split
 
@@ -69,10 +72,10 @@ module Reifier
       @request_uri = request_line_array[1]
     end
 
-    def handle_headers(socket)
+    def handle_headers
       @headers = {}
 
-      while (line = socket.gets)
+      while (line = @socket.gets)
         break if line == CRLF
         if line.include?('Host')
           @headers['HOST'] = line.gsub('Host: ', '').strip.chomp
@@ -84,8 +87,8 @@ module Reifier
       end
     end
 
-    def handle_body(socket)
-      @body = StringIO.new(socket.readpartial(@headers['CONTENT_LENGTH'].to_i))
+    def handle_body
+      @body = StringIO.new(@socket.readpartial(@headers['CONTENT_LENGTH'].to_i))
     end
 
     def request_with_body?

data/lib/reifier/response.rb

@@ -2,17 +2,18 @@ module Reifier
   class Response
     attr_accessor :status, :headers, :body, :protocol
 
-    def initialize
+    def initialize(socket)
+      @socket   = socket
       @response = ''
     end
 
-    def handle(socket)
+    def handle
       handle_request_line
       handle_headers
       handle_body
 
-      socket.write @response
-      socket.close
+      @socket.write @response
+      @socket.close
     end
 
     def <<(rack_return)

data/lib/reifier/server.rb

@@ -14,7 +14,7 @@ module Reifier
       end
 
       Signal.trap 'SIGINT' do
-        puts "Cleaning up #{child_pids.length} Workers"
+        puts "\n======= Cleaning up #{child_pids.length} Workers =======\n"
         child_pids.each do |cpid|
           begin
             Process.kill(:INT, cpid)
@@ -40,12 +40,31 @@ module Reifier
       end
     end
 
+    def load_configuration
+      if defined?(Rails)
+        path = Rails.root.join('config/reifier.rb')
+      else
+        path = Dir.pwd + '/reifier.rb'
+      end
+
+      return unless File.exist?(path)
+
+      lines = File.read(path).split("\n")
+
+      lines.each do |line|
+        option = line.split.first.capitalize
+        value  = line.split.last
+
+        @options[option.to_sym] = value
+      end
+
+      puts "======= Loaded settings from #{path} =======\n"
+    end
+
     private
 
     def spawn_worker(server)
       fork do
-        Thread.abort_on_exception = true
-
         pool  = Concurrent::FixedThreadPool.new(@options[:Threads])
 
         loop do
@@ -54,36 +73,26 @@ module Reifier
 
           pool.post do
             begin
-              request  = Request.new(@options)
-              response = Response.new
+              request  = Request.new(socket, @options)
+              response = Response.new(socket)
 
-              request.handle(socket)
+              request.handle
 
               response.protocol = request.protocol
               response << @app.call(request.rack_env)
 
-              response.handle(socket)
-
-              log_request request, response if development?
+              response.handle
             rescue Exception => e
-              log "\nError: #{e.class}\nMessage: #{e.message}\n\nBacktrace:\n\t#{e.backtrace.join("\n\t")}" if development?
               socket.close
+
+              STDERR.puts ERROR_HEADER
+              STDERR.puts "#{e.class}: #{e}"
+              STDERR.puts e.backtrace
+              STDERR.puts ERROR_FOOTER
             end
           end
         end
       end
     end
-
-    def development?
-      @options[:environment] == 'development'
-    end
-
-    def log(message)
-      puts "[#{Time.now}] #{message}"
-    end
-
-    def log_request(request, response)
-      puts "[#{Time.now}] \"#{request.request_method} #{request.request_path} #{request.protocol}\" #{response.status}"
-    end
   end
 end

data/lib/reifier/version.rb

@@ -1,3 +1,3 @@
 module Reifier
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/reifier.rb

@@ -80,4 +80,6 @@ module Reifier
   PUT  = 'PUT'.freeze
 
   HTTPParseError = Class.new(StandardError)
+  ERROR_HEADER = '=============================== FATAL SERVER ERROR =============================='.freeze
+  ERROR_FOOTER = "=================================================================================\n\n\n".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reifier
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Benny Klotz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -137,6 +137,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/reifier.rb
 - lib/rack/handler/reifier.rb
 - lib/reifier.rb
 - lib/reifier/request.rb