expedite 0.0.2 → 0.1.1

data/lib/expedite/env.rb

@@ -1,6 +1,7 @@
 require 'digest'
 require 'pathname'
 require 'expedite/version'
+require 'expedite/server/agent_manager'
 
 module Expedite
   class Env
@@ -18,7 +19,7 @@ module Expedite
 
       env = self
       @applications = Hash.new do |h, k|
-        h[k] = ApplicationManager.new(k, env)
+        h[k] = Server::AgentManager.new(k, env)
       end
     end
 

data/lib/expedite/errors.rb

@@ -5,4 +5,10 @@ module Expedite
 
   class CommandNotFound < Error
   end
+
+  class UnknownError < Error
+  end
+
+  class AgentNotFoundError < Error
+  end
 end

data/lib/expedite/helper/rails.rb

@@ -0,0 +1,14 @@
+
+Expedite.define do
+  agent :rails_environment do
+    app_root = Dir.pwd
+
+    require "#{app_root}/config/boot.rb"
+
+    require "rack"
+    rackup_file = "#{app_root}/config.ru"
+    Rack::Builder.load_file(rackup_file)
+
+    Rails.application.eager_load!
+  end
+end

data/lib/expedite/protocol.rb

@@ -0,0 +1,20 @@
+require 'socket'
+
+module Expedite
+  module Protocol
+    def send_object(object)
+      data = Marshal.dump(object)
+
+      self.puts  data.bytesize.to_i
+      self.write data
+    end
+
+    def recv_object
+      len = self.gets.to_i
+      data = self.read(len)
+      Marshal.load(data)
+    end
+  end
+end
+
+IO.include ::Expedite::Protocol

data/lib/expedite/server/agent.rb

@@ -0,0 +1,322 @@
+# Based on https://github.com/rails/spring/blob/master/lib/spring/application.rb
+require 'json'
+require 'pty'
+require 'set'
+require 'socket'
+require 'expedite/actions'
+require 'expedite/env'
+require 'expedite/failsafe_thread'
+require 'expedite/protocol'
+require 'expedite/signals'
+require 'expedite/agents'
+
+module Expedite
+  def self.agent
+    app.agent
+  end
+
+  def self.app=(app)
+    @app = app
+  end
+  def self.app
+    @app
+  end
+
+  module Server
+    class Agent
+      include Signals
+
+      attr_reader :agent
+      attr_reader :manager, :env
+
+      def initialize(agent:, manager:, env:)
+        @agent      = agent
+        @manager      = manager
+        @env          = env
+        @mutex        = Mutex.new
+        @waiting      = Set.new
+        @preloaded    = false
+        @state        = :initialized
+        @interrupt    = IO.pipe
+      end
+
+      def boot
+        # This is necessary for the terminal to work correctly when we reopen stdin.
+        Process.setsid rescue Errno::EPERM
+
+        Expedite.app = self
+
+        Signal.trap("TERM") { terminate }
+
+        env.load_helper
+        eager_preload if false #if ENV.delete("SPRING_PRELOAD") == "1"
+        run
+      end
+
+      def state(val)
+        return if exiting?
+        log "#{@state} -> #{val}"
+        @state = val
+      end
+
+      def state!(val)
+        state val
+        @interrupt.last.write "."
+      end
+
+      def app_name
+        env.app_name
+      end
+
+      def log(message)
+        env.log "[application:#{agent}] #{message}"
+      end
+
+      def preloaded?
+        @preloaded
+      end
+
+      def preload_failed?
+        @preloaded == :failure
+      end
+
+      def exiting?
+        @state == :exiting
+      end
+
+      def terminating?
+        @state == :terminating
+      end
+
+      def initialized?
+        @state == :initialized
+      end
+
+      def preload
+        log "preloading app"
+
+        @preloaded = :success
+      rescue Exception => e
+        @preloaded = :failure
+        raise e unless initialized?
+      end
+
+      def eager_preload
+        with_pty { preload }
+      end
+
+      def run
+        $0 = "expedite agent | #{app_name} | #{agent}"
+
+        Expedite::Agents.lookup(agent).after_fork(agent)
+
+        state :running
+        manager.puts
+
+        loop do
+          IO.select [manager, @interrupt.first]
+
+          if terminating? || preload_failed?
+            exit
+          else
+            serve manager.recv_io(UNIXSocket)
+          end
+        end
+      end
+
+      def serve(client)
+        log "got client"
+        manager.puts
+
+        _stdout, stderr, _stdin = streams = 3.times.map { client.recv_io }
+        [STDOUT, STDERR, STDIN].zip(streams).each { |a, b| a.reopen(b) }
+
+        preload unless preloaded?
+
+        args, env = client.recv_object.values_at("args", "env")
+
+        exec_name = args.shift
+        action    = Expedite::Actions.lookup(exec_name)
+        action.setup(client)
+
+        connect_database
+
+        pid = fork do
+          Process.setsid
+          IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
+          trap("TERM", "DEFAULT")
+
+          # Load in the current env vars, except those which *were* changed when Spring started
+          env.each { |k, v| ENV[k] = v }
+
+          # requiring is faster, so if config.cache_classes was true in
+          # the environment's config file, then we can respect that from
+          # here on as we no longer need constant reloading.
+          if @original_cache_classes
+            ActiveSupport::Dependencies.mechanism = :require
+            Rails.application.config.cache_classes = true
+          end
+
+          connect_database
+          srand
+
+          invoke_after_fork_callbacks
+          shush_backtraces
+
+          begin
+            ret = action.call(*args)
+          rescue => e
+            client.send_object("exception" => e)
+          else
+            client.send_object("return" => ret )
+          end
+        end
+
+        disconnect_database
+
+        log "forked #{pid}"
+        manager.puts pid
+
+        # Boot makes a new application, so we don't wait for it
+        if action.is_a?(Expedite::Action::Boot)
+          Process.detach(pid)
+        else
+          wait pid, streams, client
+        end
+      rescue Exception => e
+        log "exception: #{e} at #{e.backtrace.join("\n")}"
+        manager.puts unless pid
+
+        if streams && !e.is_a?(SystemExit)
+          print_exception(stderr, e)
+          streams.each(&:close)
+        end
+
+        client.puts(1) if pid
+        client.close
+      ensure
+        # Redirect STDOUT and STDERR to prevent from keeping the original FDs
+        # (i.e. to prevent `spring rake -T | grep db` from hanging forever),
+        # even when exception is raised before forking (i.e. preloading).
+        reset_streams
+      end
+
+      def terminate
+        if exiting?
+          # Ensure that we do not ignore subsequent termination attempts
+          log "forced exit"
+          @waiting.each { |pid| Process.kill("TERM", pid) }
+          Kernel.exit
+        else
+          state! :terminating
+        end
+      end
+
+      def exit
+        state :exiting
+        manager.shutdown(:RDWR)
+        exit_if_finished
+        sleep
+      end
+
+      def exit_if_finished
+        @mutex.synchronize {
+          Kernel.exit if exiting? && @waiting.empty?
+        }
+      end
+
+      def invoke_after_fork_callbacks
+        # TODO:
+      end
+
+      def disconnect_database
+        ActiveRecord::Base.remove_connection if active_record_configured?
+      end
+
+      def connect_database
+        ActiveRecord::Base.establish_connection if active_record_configured?
+      end
+
+      # This feels very naughty
+      def shush_backtraces
+        Kernel.module_eval do
+          old_raise = Kernel.method(:raise)
+          remove_method :raise
+          define_method :raise do |*args|
+            begin
+              old_raise.call(*args)
+            ensure
+              if $!
+                lib = File.expand_path("..", __FILE__)
+                $!.backtrace.reject! { |line| line.start_with?(lib) }
+              end
+            end
+          end
+          private :raise
+        end
+      end
+
+      def print_exception(stream, error)
+        first, rest = error.backtrace.first, error.backtrace.drop(1)
+        stream.puts("#{first}: #{error} (#{error.class})")
+        rest.each { |line| stream.puts("\tfrom #{line}") }
+      end
+
+      def with_pty
+        PTY.open do |master, slave|
+          [STDOUT, STDERR, STDIN].each { |s| s.reopen slave }
+          reader_thread = Expedite.failsafe_thread { master.read }
+          begin
+            yield
+          ensure
+            reader_thread.kill
+            reset_streams
+          end
+        end
+      end
+
+      def reset_streams
+        [STDOUT, STDERR].each do |stream|
+          stream.reopen(env.log_file)
+        end
+        STDIN.reopen("/dev/null")
+      end
+
+      def wait(pid, streams, client)
+        @mutex.synchronize { @waiting << pid }
+
+        # Wait in a separate thread so we can run multiple actions at once
+        Expedite.failsafe_thread {
+          begin
+            _, status = Process.wait2 pid
+            log "#{pid} exited with #{status.exitstatus}"
+
+            streams.each(&:close)
+            client.puts(status.exitstatus)
+            client.close
+          ensure
+            @mutex.synchronize { @waiting.delete pid }
+            exit_if_finished
+          end
+        }
+
+        Expedite.failsafe_thread {
+          while signal = client.gets.chomp
+            begin
+              Process.kill(signal, -Process.getpgid(pid))
+              client.puts(0)
+            rescue Errno::ESRCH
+              client.puts(1)
+            end
+          end
+        }
+      end
+
+      private
+
+      def active_record_configured?
+        defined?(ActiveRecord::Base) && ActiveRecord::Base.configurations.any?
+      end
+    end
+  end
+end

data/lib/expedite/{application/boot.rb → server/agent_boot.rb}

@@ -1,7 +1,7 @@
-require "expedite/application"
+require "expedite/server/agent"
 
-app = Expedite::Application.new(
-  variant: ENV['EXPEDITE_VARIANT'],
+app = Expedite::Server::Agent.new(
+  agent: ENV['EXPEDITE_VARIANT'],
   manager: UNIXSocket.for_fd(3),
   env: Expedite::Env.new(
     root: ENV['EXPEDITE_ROOT'],

data/lib/expedite/server/agent_manager.rb

@@ -0,0 +1,192 @@
+# Based on https://github.com/rails/spring/blob/master/lib/spring/application_manager.rb
+
+require 'bundler'
+require 'expedite/failsafe_thread'
+require 'expedite/protocol'
+require 'expedite/agents'
+
+module Expedite
+  module Server
+    class AgentManager
+      attr_reader :pid, :child, :name, :env, :status, :agent
+
+      def initialize(name, env)
+        @name  = name.to_s
+        @env   = env
+        @mutex = Mutex.new
+        @state = :running
+        @pid   = nil
+
+        @agent = Expedite::Agents.lookup(@name)
+      end
+
+      def log(message)
+        env.log "[application_manager:#{name}] #{message}"
+      end
+
+      # We're not using @mutex.synchronize to avoid the weird "<internal:prelude>:10"
+      # line which messes with backtraces in e.g. rspec
+      def synchronize
+        @mutex.lock
+        yield
+      ensure
+        @mutex.unlock
+      end
+
+      def start
+        start_child
+      end
+
+      def restart
+        return if @state == :stopping
+        start_child(true)
+      end
+
+      def alive?
+        @pid
+      end
+
+      def with_child
+        synchronize do
+          if alive?
+            begin
+              yield child
+            rescue Errno::ECONNRESET, Errno::EPIPE
+              # The child has died but has not been collected by the wait thread yet,
+              # so start a new child and try again.
+              log "child dead; starting"
+              start
+              yield child
+            end
+          else
+            log "child not running; starting"
+            start
+            yield child
+          end
+        end
+      end
+
+      # Returns the pid of the process running the command, or nil if the application process died.
+      def run(client)
+        with_child do |child|
+          child.send_io client
+          child.gets or raise Errno::EPIPE
+        end
+
+        pid = child.gets.to_i
+
+        unless pid.zero?
+          log "got worker pid #{pid}"
+          pid
+        end
+      rescue Exception => e
+        # NotImplementedError is an Exception, not StandardError
+        client.send_object("exception" => e)
+        return Process.pid
+      rescue Errno::ECONNRESET, Errno::EPIPE => e
+        log "#{e} while reading from child; returning no pid"
+        nil
+      ensure
+        client.close
+      end
+
+      def stop
+        log "stopping"
+        @state = :stopping
+
+        if pid
+          Process.kill('TERM', pid)
+          Process.wait(pid)
+        end
+      rescue Errno::ESRCH, Errno::ECHILD
+        # Don't care
+      end
+
+      def keep_alive
+        agent.keep_alive
+      end
+
+      def parent
+        agent.parent
+      end
+
+      private
+
+      def start_child(preload = false)
+        if parent
+          fork_child(preload)
+        else
+          spawn_child(preload)
+        end
+      end
+
+      def fork_child(preload = false)
+        @child, child_socket = UNIXSocket.pair
+
+        # Compose command
+        wr, rd = UNIXSocket.pair
+        wr.send_io STDOUT
+        wr.send_io STDERR
+        wr.send_io STDIN
+
+        wr.send_object(
+          'args' => ['expedite/boot', name],
+          'env' => {}
+        )
+
+        wr.send_io child_socket
+        wr.send_io env.log_file
+        wr.close
+
+        @pid = env.applications[parent].run(rd)
+
+        start_wait_thread(pid, child) if child.gets
+        child_socket.close
+      end
+
+      def spawn_child(preload = false)
+        @child, child_socket = UNIXSocket.pair
+
+        bundler_dir = File.expand_path("../..", $LOADED_FEATURES.grep(/bundler\/setup\.rb$/).first)
+        @pid = Process.spawn(
+          {
+            "EXPEDITE_VARIANT" => name,
+            "EXPEDITE_ROOT" => env.root,
+          },
+          "ruby",
+          *(bundler_dir != RbConfig::CONFIG["rubylibdir"] ? ["-I", bundler_dir] : []),
+          "-I", File.expand_path("../../..", __FILE__),
+          "-e", "require 'expedite/server/agent_boot'",
+          3 => child_socket,
+          4 => env.log_file,
+        )
+
+        start_wait_thread(@pid, child) if child.gets
+        child_socket.close
+      end
+
+      def start_wait_thread(pid, child)
+        Process.detach(pid)
+
+        Expedite.failsafe_thread do
+          # The recv can raise an ECONNRESET, killing the thread, but that's ok
+          # as if it does we're no longer interested in the child
+          loop do
+            IO.select([child])
+            break if child.recv(1, Socket::MSG_PEEK).empty?
+            sleep 0.01
+          end
+
+          log "child #{pid} shutdown"
+
+          synchronize {
+            if @pid == pid
+              @pid = nil
+              restart if keep_alive
+            end
+          }
+        end
+      end
+    end
+  end
+end