zapp 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083c3deaea0cc22f0bd269afbccdd556bf66743771aca04f63f125809c934473'
-  data.tar.gz: cd3a771ca1d0e898ddaa99c71b741412e4be8370286ec484b2059317cb632802
+  metadata.gz: d92db6f0faeb0316e5493676b97ed1566b65e14753e39423f8c73e8365aa7908
+  data.tar.gz: 253b76825620d5b55840a8e5b6686068bf7049271b093a9efb5a862d5040922d
 SHA512:
-  metadata.gz: 227f3dc9ce4c2cac931c89f2a3bca81f90f91031a78998258befb02515ee5eb1af386741646bdecc14e82649cc5cc876f360cbfb8a01bf84e119b062ab3a0eea
-  data.tar.gz: ffa29c579b1621eca0093e2c3d9a4f02975aa3be6a81aa17348aff7a7f5f54cecf4ea8aeb7829c6a821d4691c2ac9a2cd2d0be33204f2a02b1fd163b5c6990e3
+  metadata.gz: 3c1e015b962b63b8b92420746df6c5a6e470d9b9721b2b0ab4967b2b260e1fdce32baad057c048140391f3155f723626a0b959e86620d66a2318bea2c7beac81
+  data.tar.gz: 24967c889e62d3235fd162a1b6568bd63b6a72755b63e73910ac4b326fd92a5dd4026291d3f1e847e62f6b06cb9fc5e377c5061632651323576c52088c778dcc

data/lib/zapp/configuration.rb

@@ -12,6 +12,7 @@ module Zapp
       :parallelism,
       :threads_per_worker,
       :logger_class,
+      :logger_out_io,
       :log_requests,
       :log_uncaught_errors,
       :host,
@@ -33,6 +34,7 @@ module Zapp
 
       # Default logging behavior
       logger_class: Zapp::Logger,
+      logger_out_io: $stdout,
       log_requests: true,
       log_uncaught_errors: true,
 
@@ -72,7 +74,7 @@ module Zapp
       @app = new unless new.nil?
 
       @app ||= begin
-        raise(Zapp::ZapError, "Missing rackup file '#{rackup_file}'") unless File.exist?(rackup_file)
+        raise(Zapp::ZappError, "Missing rackup file '#{rackup_file}'") unless File.exist?(rackup_file)
 
         rack_app, = rack_builder.parse_file(rackup_file)
 
@@ -98,6 +100,12 @@ module Zapp
       @logger_class = new
     end
 
+    def logger_out_io(new = nil)
+      return @logger_out_io if new.nil?
+
+      @logger_out_io = new
+    end
+
     def log_requests(new = nil)
       return @log_requests if new.nil?
 

data/lib/zapp/http_context/request.rb

@@ -9,7 +9,7 @@ module Zapp
       attr_reader(:raw, :data, :body)
 
       # Request parsing is done threaded, but not in separate Ractors.
-      # So we allocate an HTTP parser per thread and assigns it to this hash key on Thread.current
+      # So we allocate an HTTP parser per thread and assign it to this hash key in Thread.current
       PARSER_THREAD_HASH_KEY = "PUMA_PARSER_INSTANCE"
 
       def initialize(socket:)
@@ -19,7 +19,7 @@ module Zapp
 
         parser.execute(data, raw, 0)
 
-        @body = Zapp::InputStream.new(string: "parser.body")
+        @body = Zapp::InputStream.new(string: parser.body)
 
         parser.reset
       end

data/lib/zapp/logger/base.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Zapp
+  class Logger
+    # Base contains all the logging functionality and is included both as class and instance methods of Zap::Logger
+    # This allows logging without creating new instances,
+    # while allowing Ractors to create their own instances for thread safety
+    module Base
+      attr_writer(:level, :prefix)
+
+      LEVELS = { TRACE: 0, DEBUG: 1, INFO: 2, WARN: 3, ERROR: 4 }.freeze
+
+      FROZEN_ENV = ENV.map { |k, v| [k.freeze, v.freeze] }
+                      .to_h.freeze
+
+      # The hash key in Ractor.current that stores the mutex for writing to output
+      OUT_IO_MUTEX_KEY = "ZAPP_LOGGER_OUT_IO_MUTEX"
+
+      def trace(msg) = log("TRACE", msg)
+
+      def debug(msg) = log("DEBUG", msg)
+
+      def info(msg) = log("INFO", msg)
+
+      def warn(msg) = log("WARN", msg)
+
+      def error(msg) = log("ERROR", msg)
+
+      def level
+        @level ||= begin
+          log_level = FROZEN_ENV["LOG_LEVEL"]
+
+          if log_level == "" || log_level.nil?
+            LEVELS[:DEBUG]
+          else
+            resolved_level = LEVELS[log_level.upcase.to_sym]
+
+            if resolved_level.nil?
+              raise(
+                Zapp::ZappError,
+                "Invalid log level '#{log_level.upcase}', must be one of [#{LEVELS.keys.join(', ')}]"
+              )
+            end
+
+            resolved_level
+          end
+        end
+      end
+
+      def log(current_level, msg, **_tags)
+        return unless level <= LEVELS[current_level.to_sym]
+
+        write("--- #{prefix} [#{current_level}] #{msg}\n")
+      end
+
+      def flush
+        writing_thread_pool.wait_for_termination(0.1)
+
+        out_io_mutex.synchronize do
+          out.flush
+        end
+      end
+
+      # @param new_out [IO]
+      def out=(new_out)
+        @out = new_out
+      end
+
+      protected
+
+      # @return [IO]
+      def out
+        @out ||= Zapp.config.logger_out_io
+      end
+
+      # @return [String]
+      def prefix = @prefix ||= Ractor.current.name
+
+      def write(msg)
+        writing_thread_pool.post do
+          out_io_mutex.synchronize do
+            out.print(msg)
+          end
+        end
+      end
+
+      # We really just use this as a queue
+      # TODO: There's probably a smarter way of doing this with less overhead,
+      # TODO: or maybe we should just actually write logs multi-threaded
+      def writing_thread_pool
+        @writing_thread_pool ||= Concurrent::ThreadPoolExecutor.new(
+          min_threads: 1,
+          max_threads: 1,
+          max_queue: 100
+        )
+      end
+
+      def out_io_mutex
+        Ractor.current[OUT_IO_MUTEX_KEY] ||= Thread::Mutex.new
+      end
+    end
+  end
+end

data/lib/zapp/logger.rb

@@ -1,74 +1,37 @@
 # frozen_string_literal: true
 
+require_relative("logger/base")
+
 module Zapp
-  # The default logger for zap
+  # The default logger for Zapp
   class Logger
-    # Base contains all the logging functionality and is included both as class and instance methods of Zap::Logger
-    # This allows logging without creating new instances,
-    # while allowing Ractors to create their own instances for thread safety
-    module Base
-      attr_writer(:level, :prefix)
-
-      LEVELS = { TRACE: 0, DEBUG: 1, INFO: 2, WARN: 3, ERROR: 4 }.freeze
-
-      FROZEN_ENV = ENV.map { |k, v| [k.freeze, v.freeze] }
-                      .to_h.freeze
-
-      def trace(msg)
-        log("TRACE", msg)
-      end
-
-      def debug(msg)
-        log("DEBUG", msg)
-      end
+    include(Zapp::Logger::Base)
 
-      def info(msg)
-        log("INFO", msg)
-      end
+    def initialize
+      yield(self) if block_given?
+    end
 
-      def warn(msg)
-        log("WARN", msg)
-      end
+    class << self
+      # The hash key in Ractor.current that stores the global Zapp::Logger instance
+      GLOBAL_INSTANCE_KEY = "ZAPP_LOGGER_INSTANCE"
 
-      def error(msg)
-        log("ERROR", msg)
+      def instance
+        Ractor.current[GLOBAL_INSTANCE_KEY] ||= new
       end
 
-      def level
-        @level ||= begin
-          log_level = FROZEN_ENV["LOG_LEVEL"]
-
-          if log_level == "" || log_level.nil?
-            LEVELS[:DEBUG]
-          else
-            resolved_level = LEVELS[log_level.upcase.to_sym]
-
-            if resolved_level.nil?
-              raise(
-                Zapp::ZappError,
-                "Invalid log level '#{log_level.upcase}', must be one of [#{LEVELS.keys.join(', ')}]"
-              )
-            end
+      private
 
-            resolved_level
-          end
+      def method_missing(symbol, *args)
+        if respond_to_missing?(symbol)
+          instance.public_send(symbol, *args)
+        else
+          super
         end
       end
 
-      def log(current_level, msg, **_tags)
-        puts("--- #{@prefix} [#{current_level}] #{msg}") if level <= LEVELS[current_level.to_sym]
+      def respond_to_missing?(symbol, include_private = false)
+        instance.respond_to?(symbol) || super(symbol, include_private)
       end
     end
-    include(Zapp::Logger::Base)
-
-    def initialize
-      yield(self) if block_given?
-    end
-
-    class << self
-      include(Zapp::Logger::Base)
-    end
   end
 end
-
-Zapp::Logger.prefix = "Zapp"

data/lib/zapp/server.rb

@@ -6,12 +6,15 @@ module Zapp
     attr_reader(:worker_pool, :socket_pipe_receiver)
 
     def initialize
+      # Ensure config.ru file is loaded just once by main ractor
+      Zapp.config.app
+
       @socket_pipe = Zapp::Pipe.new
       @context_pipe = Zapp::Pipe.new
 
       @socket_pipe_receiver = Zapp::SocketPipe::Receiver.new(pipe: @socket_pipe)
 
-      @worker_pool = Zapp::WorkerPool.new(app: Zapp.config.app, socket_pipe: @socket_pipe, context_pipe: @context_pipe)
+      @worker_pool = Zapp::WorkerPool.new(socket_pipe: @socket_pipe, context_pipe: @context_pipe)
     end
 
     def run
@@ -38,16 +41,17 @@ module Zapp
       Zapp::Logger.info("Received signal #{err.class.name}") unless err.nil?
       Zapp::Logger.info("Gracefully shutting down workers, allowing request processing to finish")
 
-      socket_pipe_receiver.drain
       worker_pool.drain
 
       Zapp::Logger.info("Done. See you next time!")
+      Zapp::Logger.flush
     end
 
     private
 
     def log_start
-      Zapp::Logger.info("
+      Zapp::Logger.info(
+        "
         ⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡
         ⚡  ███████╗ █████╗ ██████╗ ██████╗   ⚡
         ⚡  ╚══███╔╝██╔══██╗██╔══██╗██╔══██╗  ⚡
@@ -56,7 +60,8 @@ module Zapp
         ⚡  ███████╗██║  ██║██║     ██║       ⚡
         ⚡  ╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝       ⚡
         ⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡⚡
-")
+"
+      )
       Zapp::Logger.info("Zapp version: #{Zapp::VERSION}")
       Zapp::Logger.info("Environment: #{Zapp.config.mode}")
       Zapp::Logger.info("Serving: #{Zapp.config.env[Rack::RACK_URL_SCHEME]}://#{Zapp.config.host}:#{Zapp.config.port}")

data/lib/zapp/socket_pipe/receiver.rb

@@ -19,14 +19,6 @@ module Zapp
       def take
         Ractor.select(pipe, raw_tcp_pipe)[1]
       end
-
-      def drain
-        Thread.new do
-          loop do
-            take
-          end
-        end
-      end
     end
   end
 end

data/lib/zapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zapp
-  VERSION = "0.2.1"
+  VERSION = "0.2.4"
 end

data/lib/zapp/worker/request_processor.rb

@@ -4,11 +4,9 @@ module Zapp
   class Worker < Ractor
     # Processes HTTP requests
     class RequestProcessor
-      attr_reader(:app, :config, :socket_pipe_sender, :context_pipe)
+      attr_reader(:socket_pipe_sender, :context_pipe)
 
-      def initialize(context_pipe:, socket_pipe:, app:, config:)
-        @app = app
-        @config = config
+      def initialize(context_pipe:, socket_pipe:)
         @socket_pipe_sender = Zapp::SocketPipe::Sender.new(pipe: socket_pipe)
         @context_pipe = context_pipe
       end
@@ -16,26 +14,24 @@ module Zapp
       def loop
         while (context = context_pipe.take)
           if context == Zapp::WorkerPool::SIGNALS[:EXIT]
-            logger.trace("Received exit signal, shutting down")
-            thread_pool.shutdown
+            Zapp::Logger.trace("Received exit signal, shutting down")
+            shutdown
             break
           end
 
+          process = lambda {
+            process(context: context)
+          }
 
-            process = lambda {
-              process(context: context)
-            }
-
-            if config.log_requests
-              log_request_time(context: context, &process)
-            else
-              process.call
-            end
-
-            # We send sockets that the client hasn't closed yet,
-            # back to the main ractor for HTTP request parsing again
-            socket_pipe_sender.push(context.socket) unless context.client_closed?
+          if Zapp.config.log_requests
+            log_request_time(context: context, &process)
+          else
+            process.call
+          end
 
+          # We send sockets that the client hasn't closed yet,
+          # back to the main ractor for HTTP request parsing again
+          socket_pipe_sender.push(context.socket) unless context.client_closed?
         end
       end
 
@@ -43,16 +39,16 @@ module Zapp
 
       # Processes an HTTP request
       def process(context:)
-        env = prepare_env(data: context.req.data, body: context.req.body, env: config.env.dup)
+        env = prepare_env(data: context.req.data, body: context.req.body, env: Zapp.config.env.dup)
 
-        status, headers, response_body_stream = @app.call(env)
+        status, headers, response_body_stream = Zapp.config.app.call(env)
 
         response_body = body_stream_to_string(response_body_stream)
 
         context.res.write(data: response_body, status: status, headers: headers)
       rescue StandardError => e
         context.res.write(data: "An unexpected error occurred", status: 500, headers: {})
-        logger.error("#{e}\n\n#{e.backtrace&.join(",\n")}") if config.log_uncaught_errors
+        Zapp::Logger.error("#{e}\n\n#{e.backtrace&.join(",\n")}") if Zapp.config.log_uncaught_errors
       end
 
       # Merges HTTP data and body into the env to be passed to the rack app
@@ -79,7 +75,7 @@ module Zapp
         path = context.req.data["PATH_INFO"]
         status = context.res.status
 
-        logger.info(
+        Zapp::Logger.info(
           "#{method} #{path} - Completed in #{request_time}ms with status #{status}"
         )
       end
@@ -96,19 +92,18 @@ module Zapp
         response_body
       end
 
+      def shutdown
+        Zapp::Logger.flush
+        thread_pool.shutdown
+      end
+
       def thread_pool
         @thread_pool ||= Concurrent::ThreadPoolExecutor.new(
-          min_threads: config.threads_per_worker,
-          max_threads: config.threads_per_worker,
-          max_queue: 1000,
+          min_threads: Zapp.config.threads_per_worker,
+          max_threads: Zapp.config.threads_per_worker,
+          max_queue: 1000
         )
       end
-
-      def logger
-        @logger ||= config.logger_class.new do |l|
-          l.prefix = Ractor.current.name
-        end
-      end
     end
   end
 end

data/lib/zapp/worker.rb

@@ -6,19 +6,18 @@ module Zapp
   # One worker processing requests in parallel
   class Worker < Ractor
     class << self
-      def new(context_pipe:, socket_pipe:, app:, index:)
+      def new(context_pipe:, socket_pipe:, index:)
         super(
           context_pipe,
           socket_pipe,
-          app,
           Zapp.config.dup,
           name: name(index)
-        ) do |context_pipe, socket_pipe, app, config|
+        ) do |context_pipe, socket_pipe, config|
+          Ractor.current[Zapp::RACTOR_CONFIG_KEY] = config
+
           processor = Zapp::Worker::RequestProcessor.new(
             socket_pipe: socket_pipe,
-            context_pipe: context_pipe,
-            app: app,
-            config: config
+            context_pipe: context_pipe
           )
 
           processor.loop

data/lib/zapp/worker_pool.rb

@@ -9,14 +9,13 @@ module Zapp
       EXIT: :exit
     }.freeze
 
-    def initialize(app:, context_pipe:, socket_pipe:)
+    def initialize(context_pipe:, socket_pipe:)
       @context_pipe = context_pipe
       @workers = []
       Zapp.config.parallelism.times do |i|
         @workers << Worker.new(
           context_pipe: context_pipe,
           socket_pipe: socket_pipe,
-          app: app,
           index: i
         )
       end
@@ -30,9 +29,11 @@ module Zapp
     # Finishes processing of all requests and shuts down workers
     def drain
       Zapp.config.parallelism.times { process(context: SIGNALS[:EXIT]) }
-      workers.map(&:terminate)
-    rescue Ractor::ClosedError
-      # Ractor has already exited
+      workers.map do |w|
+        w.terminate
+      rescue Ractor::ClosedError
+        # Ractor has already exited
+      end
     end
   end
 end

data/lib/zapp.rb

@@ -11,11 +11,14 @@ require("rack")
 module Zapp
   class ZappError < StandardError; end
 
+  # The hash key in Ractor.current that stores the global Zapp::Configuration instance
+  RACTOR_CONFIG_KEY = "ZAPP_CONFIG"
+
   class << self
     def config(reset: false)
-      @config = Zapp::Configuration.new if reset
+      Ractor.current[RACTOR_CONFIG_KEY] = Zapp::Configuration.new if reset
 
-      @config ||= Zapp::Configuration.new
+      Ractor.current[RACTOR_CONFIG_KEY] ||= Zapp::Configuration.new
     end
 
     def configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Mathias H Steffensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-10 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -97,116 +97,12 @@ dependencies:
 description:
 email:
 - mathiashsteffensen@protonmail.com
-executables: []
+executables:
+- zapp
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- Gemfile
-- Gemfile.lock
-- Guardfile
-- LICENSE.txt
-- README.md
-- Rakefile
 - bin/zapp
-- examples/rails-app/.browserslistrc
-- examples/rails-app/.gitattributes
-- examples/rails-app/.gitignore
-- examples/rails-app/.ruby-version
-- examples/rails-app/Gemfile
-- examples/rails-app/Gemfile.lock
-- examples/rails-app/Rakefile
-- examples/rails-app/app/assets/config/manifest.js
-- examples/rails-app/app/assets/images/.keep
-- examples/rails-app/app/assets/stylesheets/application.css
-- examples/rails-app/app/channels/application_cable/channel.rb
-- examples/rails-app/app/channels/application_cable/connection.rb
-- examples/rails-app/app/controllers/application_controller.rb
-- examples/rails-app/app/controllers/concerns/.keep
-- examples/rails-app/app/helpers/application_helper.rb
-- examples/rails-app/app/javascript/channels/consumer.js
-- examples/rails-app/app/javascript/channels/index.js
-- examples/rails-app/app/javascript/packs/application.js
-- examples/rails-app/app/jobs/application_job.rb
-- examples/rails-app/app/mailers/application_mailer.rb
-- examples/rails-app/app/models/application_record.rb
-- examples/rails-app/app/models/concerns/.keep
-- examples/rails-app/app/views/layouts/application.html.erb
-- examples/rails-app/app/views/layouts/mailer.html.erb
-- examples/rails-app/app/views/layouts/mailer.text.erb
-- examples/rails-app/babel.config.js
-- examples/rails-app/bin/bundle
-- examples/rails-app/bin/rails
-- examples/rails-app/bin/rake
-- examples/rails-app/bin/setup
-- examples/rails-app/bin/spring
-- examples/rails-app/bin/webpack
-- examples/rails-app/bin/webpack-dev-server
-- examples/rails-app/bin/yarn
-- examples/rails-app/bin/zapp
-- examples/rails-app/config.ru
-- examples/rails-app/config/application.rb
-- examples/rails-app/config/boot.rb
-- examples/rails-app/config/cable.yml
-- examples/rails-app/config/credentials.yml.enc
-- examples/rails-app/config/database.yml
-- examples/rails-app/config/environment.rb
-- examples/rails-app/config/environments/development.rb
-- examples/rails-app/config/environments/production.rb
-- examples/rails-app/config/environments/test.rb
-- examples/rails-app/config/initializers/application_controller_renderer.rb
-- examples/rails-app/config/initializers/assets.rb
-- examples/rails-app/config/initializers/backtrace_silencers.rb
-- examples/rails-app/config/initializers/content_security_policy.rb
-- examples/rails-app/config/initializers/cookies_serializer.rb
-- examples/rails-app/config/initializers/filter_parameter_logging.rb
-- examples/rails-app/config/initializers/inflections.rb
-- examples/rails-app/config/initializers/mime_types.rb
-- examples/rails-app/config/initializers/permissions_policy.rb
-- examples/rails-app/config/initializers/wrap_parameters.rb
-- examples/rails-app/config/locales/en.yml
-- examples/rails-app/config/puma.rb
-- examples/rails-app/config/routes.rb
-- examples/rails-app/config/spring.rb
-- examples/rails-app/config/storage.yml
-- examples/rails-app/config/webpack/development.js
-- examples/rails-app/config/webpack/environment.js
-- examples/rails-app/config/webpack/production.js
-- examples/rails-app/config/webpack/test.js
-- examples/rails-app/config/webpacker.yml
-- examples/rails-app/config/zapp.rb
-- examples/rails-app/db/seeds.rb
-- examples/rails-app/lib/assets/.keep
-- examples/rails-app/lib/tasks/.keep
-- examples/rails-app/log/.keep
-- examples/rails-app/package.json
-- examples/rails-app/postcss.config.js
-- examples/rails-app/public/404.html
-- examples/rails-app/public/422.html
-- examples/rails-app/public/500.html
-- examples/rails-app/public/apple-touch-icon-precomposed.png
-- examples/rails-app/public/apple-touch-icon.png
-- examples/rails-app/public/favicon.ico
-- examples/rails-app/public/robots.txt
-- examples/rails-app/storage/.keep
-- examples/rails-app/test/application_system_test_case.rb
-- examples/rails-app/test/channels/application_cable/connection_test.rb
-- examples/rails-app/test/controllers/.keep
-- examples/rails-app/test/fixtures/files/.keep
-- examples/rails-app/test/helpers/.keep
-- examples/rails-app/test/integration/.keep
-- examples/rails-app/test/mailers/.keep
-- examples/rails-app/test/models/.keep
-- examples/rails-app/test/system/.keep
-- examples/rails-app/test/test_helper.rb
-- examples/rails-app/tmp/.keep
-- examples/rails-app/tmp/pids/.keep
-- examples/rails-app/vendor/.keep
-- examples/rails-app/yarn.lock
 - lib/rack/handler/zapp.rb
 - lib/zapp.rb
 - lib/zapp/cli.rb
@@ -216,6 +112,7 @@ files:
 - lib/zapp/http_context/response.rb
 - lib/zapp/input_stream.rb
 - lib/zapp/logger.rb
+- lib/zapp/logger/base.rb
 - lib/zapp/parser.rb
 - lib/zapp/pipe.rb
 - lib/zapp/server.rb
@@ -225,7 +122,6 @@ files:
 - lib/zapp/worker.rb
 - lib/zapp/worker/request_processor.rb
 - lib/zapp/worker_pool.rb
-- zapp.gemspec
 homepage: https://github.com/mathiashsteffensen/zapp
 licenses:
 - MIT