zeus 0.11.2 → 0.12.0.pre

data/lib/zeus.rb

@@ -11,8 +11,7 @@ module Zeus
   end
 
   class << self
-    attr_accessor :plan
-    attr_accessor :dummy_tty
+    attr_accessor :plan, :dummy_tty, :master_socket
 
     # 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,
@@ -30,12 +29,18 @@ module Zeus
       STDOUT.reopen(dummy_tty)
     end
 
+    def setup_master_socket!
+      return master_socket if master_socket
+
+      fd = ENV['ZEUS_MASTER_FD'].to_i
+      self.master_socket = UNIXSocket.for_fd(fd)
+    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
-      master = UNIXSocket.for_fd(fd)
+
+      setup_dummy_tty!
+      master = setup_master_socket!
 
       # I need to give the master a way to talk to me exclusively
       local, remote = UNIXSocket.pair(Socket::SOCK_STREAM)
@@ -78,17 +83,12 @@ module Zeus
       remote.close
       sock.close
 
-      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_and_arguments = local.recv(1024)
+      pid_and_arguments.chomp!("\0")
+      # pid_and_arguments.force_encoding("ASCII-8BIT")
+      pid_and_arguments =~ /(.*?):(.*)/
+      client_pid, arguments = $1.to_i, $2
+      arguments.chomp!("\0")
 
       pid = fork {
         $0 = "zeus command: #{identifier}"
@@ -119,9 +119,7 @@ module Zeus
       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}"}
+            Process.kill(0, client_pid)
           rescue Errno::ESRCH
             Process.kill(9, command_pid)
           end
@@ -134,6 +132,7 @@ module Zeus
       features.each do |t|
         begin
           sock.write "F:#{t}\0"
+          sock.flush
         rescue Errno::ENOBUFS
           sleep 0.2
           retry

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.11.2
-  prerelease: 
+  version: 0.12.0.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -78,9 +78,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23