zeus 0.2.3 → 0.2.4

data/TODO.md

@@ -1,13 +1,8 @@
 ## TODO (roughly prioritized)
 
-* After an acceptor is killed, attempting to request that command while it is reloading causes a server error.
 * Make sure that when a command process's connection is dropped, it is killed
 * less leaky handling of at_exit pid killing
-* Instead of exiting when requesting an as-yet-unbooted acceptor, wait until it's available then run.
 * Refactor, refactor, refactor...
-* Make sure client connection requests are handled immediately (Chunk the select loop)
-* Don't fork to handshake client to acceptor
-* Eliminate the client-side exit lag for zeus commands.
 * Support other frameworks?
 * Figure out how to run full test suites without multiple env loads
 

data/lib/zeus/cli.rb

@@ -17,6 +17,8 @@ module Zeus
     D
     # method_option "rails", type: :string, banner: "Use the rails template instead of auto-detecting based on project contents"
     def init
+      require 'fileutils'
+
       if File.exist?(".zeus.rb")
         Zeus.ui.error ".zeus.rb already exists at #{Dir.pwd}/.zeus.rb"
         exit 1

data/lib/zeus/client.rb

@@ -69,7 +69,12 @@ module Zeus
     def handle_stdin(buffer)
       input = $stdin.readpartial(4096, buffer)
       input.scan(SIGNAL_REGEX).each { |signal|
-        Process.kill(SIGNALS[signal], pid)
+        begin
+          Process.kill(SIGNALS[signal], pid)
+        rescue Errno::ESRCH
+          # we're trying to kill a process that died. Just quit.
+          exit
+        end
       }
       @master << input
     end

data/lib/zeus/server.rb

@@ -79,9 +79,9 @@ module Zeus
     end
 
     def handle_messages
-      loop do
+      50.times {
         handle_message
-      end
+      }
     rescue Errno::EAGAIN
     end
 

data/lib/zeus/server/acceptor.rb

@@ -22,7 +22,7 @@ module Zeus
       end
 
       def registration_data(pid)
-        {pid: pid, commands: [name, *aliases], description: description}.to_json
+        {type: 'registration', pid: pid, commands: [name, *aliases], description: description}.to_json
       end
 
       def descendent_acceptors
@@ -66,9 +66,12 @@ module Zeus
             exit 0
           }
 
-          $LOADED_FEATURES.each do |f|
-            @server.w_feature "#{pid}:#{f}"
-          end
+          # Apparently threads don't continue in forks.
+          Thread.new {
+            $LOADED_FEATURES.each do |f|
+              @server.w_feature "#{pid}:#{f}"
+            end
+          }
 
           loop do
             prefork_action!
@@ -88,9 +91,14 @@ module Zeus
             Process.detach(child)
             terminal.close
           end
+
         }
         currpid = Process.pid
-        at_exit { Process.kill(9, pid) if Process.pid == currpid rescue nil }
+        at_exit {
+          if Process.pid == currpid
+            Process.kill(9, pid) rescue nil
+          end
+        }
         pid
       end
 

data/lib/zeus/server/acceptor_registration_monitor.rb

@@ -3,25 +3,59 @@ module Zeus
     class AcceptorRegistrationMonitor
 
       def datasource          ; @reg_monitor ; end
-      def on_datasource_event ; handle_registration ; end
+      def on_datasource_event ; handle_message ; end
 
       def initialize
         @reg_monitor, @reg_acceptor = UNIXSocket.pair
         @acceptors = []
+        @pings = {}
       end
 
       AcceptorStub = Struct.new(:pid, :socket, :commands, :description)
 
-      def handle_registration
+      def handle_message
         io = @reg_monitor.recv_io
 
         data = JSON.parse(io.readline.chomp)
+        type = data['type']
+
+        case type
+        when 'wait' ; handle_wait(io, data)
+        when 'registration' ; handle_registration(io, data)
+        when 'deregistration' ; handle_deregistration(io, data)
+        else raise "invalid message"
+        end
+      end
+
+      def handle_wait(io, data)
+        command = data['command'].to_s
+        @pings[command] ||= []
+        @pings[command] << io
+      end
+
+      def handle_deregistration(io, data)
+        pid = data['pid'].to_i
+        @acceptors.reject!{|acc|acc.pid == pid}
+      end
+
+      def handle_registration(io, data)
         pid         = data['pid'].to_i
         commands    = data['commands']
         description = data['description']
 
         @acceptors.reject!{|ac|ac.commands == commands}
         @acceptors << AcceptorStub.new(pid, io, commands, description)
+        notify_pings_for_commands(commands)
+      end
+
+      def notify_pings_for_commands(commands)
+        (commands || []).each do |command|
+          (@pings[command.to_s] || []).each do |ping|
+            ping.puts "ready\n"
+            ping.close
+          end
+          @pings[command.to_s] = nil
+        end
       end
 
       def find_acceptor_for_command(command)

data/lib/zeus/server/client_handler.rb

@@ -39,9 +39,25 @@ module Zeus
 
       def handle_server_connection
         s_client = @server.accept
-        fork { handshake_client_to_acceptor(s_client) ; exit }
+
+        # 1
+        data = JSON.parse(s_client.readline.chomp)
+        command, arguments = data.values_at('command', 'arguments')
+
+        # 2
+        client_terminal = s_client.recv_io
+
+        Thread.new {
+          loop do
+            pid = fork { handshake_client_to_acceptor(s_client, command, arguments, client_terminal) ; exit }
+            Process.wait(pid)
+            break unless $?.exitstatus == REATTEMPT_HANDSHAKE
+          end
+        }
       end
 
+      REATTEMPT_HANDSHAKE = 204
+
       NoSuchCommand = Class.new(Exception)
       AcceptorNotBooted = Class.new(Exception)
       ApplicationLoadFailed = Class.new(Exception)
@@ -53,6 +69,22 @@ module Zeus
         s_client.close
       end
 
+      def wait_for_acceptor(s_client, client_terminal, command, msg)
+        s_client << "0\n"
+        client_terminal << "[zeus] #{msg}\n"
+
+        regmsg = {type: 'wait', command: command}
+
+        s, r = UNIXSocket.pair
+        @reg_monitor.acceptor_registration_socket.send_io(r)
+        s << "#{regmsg.to_json}\n"
+
+        s.readline # wait
+        s.close
+
+        exit REATTEMPT_HANDSHAKE
+      end
+
       #  client clienthandler acceptor
       # 1  ---------->                | {command: String, arguments: [String]}
       # 2  ---------->                | Terminal IO
@@ -60,14 +92,7 @@ module Zeus
       # 4            ----------->     | Arguments (json array)
       # 5            <-----------     | pid
       # 6  <---------                 | pid
-      def handshake_client_to_acceptor(s_client)
-        # 1
-        data = JSON.parse(s_client.readline.chomp)
-        command, arguments = data.values_at('command', 'arguments')
-
-        # 2
-        client_terminal = s_client.recv_io
-
+      def handshake_client_to_acceptor(s_client, command, arguments, client_terminal)
         # 3
         unless @acceptor_commands.include?(command.to_s)
           return exit_with_message(
@@ -76,17 +101,24 @@ module Zeus
         end
         acceptor = @reg_monitor.find_acceptor_for_command(command)
         unless acceptor
-          return exit_with_message(
-            s_client, client_terminal,
-            "not yet ready to process `#{command}`. Try again right away.")
+          wait_for_acceptor(
+            s_client, client_terminal, command,
+            "waiting for `#{command}` to finish booting...")
         end
         usock = UNIXSocket.for_fd(acceptor.socket.fileno)
         if usock.closed?
-          return exit_with_message(
-            s_client, client_terminal,
-            "`#{command}` handler is reloading a dependency. Try again right away.")
+          wait_for_acceptor(
+            s_client, client_terminal, command,
+            "waiting for `#{command}` to finish reloading dependencies...")
+        end
+        begin
+          usock.send_io(client_terminal)
+        rescue Errno::EPIPE
+          wait_for_acceptor(
+            s_client, client_terminal, command,
+            "waiting for `#{command}` to finish reloading dependencies...")
         end
-        usock.send_io(client_terminal)
+
 
         Zeus.ui.info "accepting connection for #{command}"
 

data/lib/zeus/server/file_monitor/fsevent.rb

@@ -17,13 +17,13 @@ module Zeus
         end
 
         def handle_changed_files
-          loop do
+          50.times {
             begin
               read_and_notify_files
             rescue Errno::EAGAIN
               break
             end
-          end
+          }
         end
 
         def read_and_notify_files

data/lib/zeus/server/stage.rb

@@ -66,7 +66,9 @@ module Zeus
             pids[stage.run] = stage
           end
 
-          $LOADED_FEATURES.each { |f| notify_feature(f) }
+          Thread.new {
+            $LOADED_FEATURES.each { |f| notify_feature(f) }
+          }
 
           loop do
             begin

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies: []
 description: Zeus preloads pretty much everything you'll ever want to use in development.
 email: