lib/zeusd/daemon.rb in zeusd-0.1.1 vs lib/zeusd/daemon.rb in zeusd-0.2.0

@@ -5,40 +5,40 @@
 
 module Zeusd
   class DaemonException < StandardError; end
 
   class Daemon
+    attr_reader :cwd, :verbose, :log_file, :log_queue, :interpreter, :child_process
+
+
     include Hooks
-    define_hooks :after_output, :after_start!, :after_stop!, :after_start_process!
+    define_hooks :after_start!, :after_stop!, :after_output
 
     after_start!  { log(:start) }
     after_stop!   { log(:stop) }
     after_output  {|x| log(x, :zeus) }
 
-    after_start_process! :ensure_log_worker
-
     after_stop! do
       (socket_file.delete rescue nil) if socket_file.exist?
-      @process = nil
     end
 
     after_output do |output|
       interpreter.translate(output)
       puts(output) if verbose?
     end
 
-    attr_reader :cwd, :verbose, :log_file, :log_queue, :interpreter, :child_process
-
     def initialize(options = {})
       @cwd         = Pathname.new(options[:cwd] || Dir.pwd).realpath
       @verbose     = !!options[:verbose]
       @interpreter = Interpreter.new
     end
 
     def start!(options = {})
-      @process = Zeusd::Process.find(start_process!.pid)
+      start_child_process!
 
+      @process = Zeusd::Process.find(child_process.pid)
+
       if options.fetch(:block, false)
         sleep(0.1) until loaded?
       end
 
       self
@@ -51,18 +51,20 @@
     end
 
     def stop!
       return self unless process
 
-      # Kill Pids and Wait
+      # Kill process tree and wait for exits
       process.kill!(:recursive => true, :wait => true)
 
       # Check for remaining processes
       if[process, process.descendants].flatten.select(&:alive?).any?
         raise DaemonException, "Unable to KILL processes: " + alive_processes.join(', ')
       end
 
+      @process = nil
+
       self
     ensure
       run_hook :after_stop!
     end
 
@@ -72,11 +74,10 @@
 
     def loaded?
       interpreter.complete?
     end
 
-
     def log_file
       cwd.join('log/zeusd.log')
     end
 
     def socket_file
@@ -103,20 +104,21 @@
           log_file.open("a+") {|f| f.write(value) }
         end
       end
     end
 
-    def start_process!
+    def start_child_process!
       @reader, @writer = IO.pipe
-      @child_process   = ChildProcess.build("zeus", "start")
+      @child_process = ChildProcess.build("zeus", "start")
       @child_process.environment["BUNDLE_GEMFILE"] = cwd.join("Gemfile").to_path
       @child_process.io.stdout = @child_process.io.stderr = @writer
-      @child_process.cwd       = cwd.to_path
-      @child_process.detach    = true
+      @child_process.cwd = cwd.to_path
+      @child_process.detach = true
       @child_process.start
+
       @writer.close
 
-      run_hook :after_start_process!
+      ensure_log_worker
 
       Thread.new do
         while (buffer = (@reader.readpartial(10000) rescue nil)) do
           run_hook :after_output, buffer
         end
\ No newline at end of file