zeus 0.11.1 → 0.11.2

data/lib/zeus.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
 require 'socket'
 require 'json'
+require 'pty'
 
 require 'zeus/load_tracking'
 
@@ -10,8 +12,26 @@ module Zeus
 
   class << self
     attr_accessor :plan
+    attr_accessor :dummy_tty
+
+    # this is totally asinine, but readline gets super confused when it's
+    # required at a time when stdin or stdout is not connected to a TTY,
+    # no matter what we do to tell it otherwise later. So we create a dummy
+    # TTY in case readline is required.
+    #
+    # Yup.
+    def setup_dummy_tty!
+      return if self.dummy_tty
+      master, self.dummy_tty = PTY.open
+      Thread.new {
+        loop { master.read(1024) }
+      }
+      STDIN.reopen(dummy_tty)
+      STDOUT.reopen(dummy_tty)
+    end
 
     def go(identifier=:boot)
+      setup_dummy_tty!
       $0 = "zeus slave: #{identifier}"
       # okay, so I ahve this FD that I can use to send data to the master.
       fd = ENV['ZEUS_MASTER_FD'].to_i
@@ -58,10 +78,20 @@ module Zeus
       remote.close
       sock.close
 
-      arguments = local.recv(1024)
-      arguments.chomp!("\0")
+      begin
+        pid_and_arguments = local.recv(1024)
+        pid_and_arguments.chomp!("\0")
+        # pid_and_arguments.force_encoding("ASCII-8BIT")
+        File.open("b.log","a"){|f|f.puts "PA#{pid_and_arguments}" }
+        pid_and_arguments =~ /(.*?):(.*)/
+        client_pid, arguments = $1.to_i, $2
+        arguments.chomp!("\0")
+      rescue => e
+        File.open("b.log","a"){|f|f.puts e.message ; f.puts e.backtrace}
+      end
 
       pid = fork {
+        $0 = "zeus command: #{identifier}"
         plan.after_fork
         client_terminal = local.recv_io
         local.write "P:#{Process.pid}:\0"
@@ -75,6 +105,8 @@ module Zeus
         plan.send(identifier)
       }
 
+      kill_command_if_client_quits!(pid, client_pid)
+
       Process.wait(pid)
       code = $?.exitstatus || 0
 
@@ -83,6 +115,21 @@ module Zeus
       local.close
     end
 
+    def kill_command_if_client_quits!(command_pid, client_pid)
+      Thread.new {
+        loop {
+          begin
+            File.open("b.log","a"){|f|f.puts "Checking #{client_pid}"}
+            x=Process.kill(0, client_pid)
+            File.open("b.log","a"){|f|f.puts "Checked #{client_pid} and got #{x}"}
+          rescue Errno::ESRCH
+            Process.kill(9, command_pid)
+          end
+          sleep 1
+        }
+      }
+    end
+
     def notify_features(sock, features)
       features.each do |t|
         begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source