fate 0.2.11 → 0.2.12

data/lib/fate.rb

@@ -35,16 +35,23 @@ class Fate
   end
 
   def run(&block)
-    start
-    if block
-      yield(self)
-      manager.stop
+    if start
+      if block
+        yield(self)
+        stop
+      end
+    else
+      logger.error "Failed to start"
     end
   end
 
   def start
-    manager.start_group(@service.commands)
-    logger.green "All commands are running."
+    if manager.start_group(@service.commands)
+      logger.green "All commands are running."
+      true
+    else
+      false
+    end
   end
 
   def stop

data/lib/fate/process_manager.rb

@@ -23,20 +23,24 @@ class Fate
     end
 
     def stop
-      @names_by_pid.each do |pid, name|
-        kill(name)
+      @mutex.synchronize do
+        @names_by_pid.each do |pid, name|
+          kill(name)
+        end
       end
     end
 
     def start_group(hash)
       hash.each do |name, command|
         @commands_by_name[name] = command
-        start_command(name, command)
+        start_command(name, command) unless @down_in_flames
       end
 
       until @threads.size == hash.size
+        return false if @down_in_flames
         sleep 0.1
       end
+      return true
     end
 
     def start_command(name, command)
@@ -52,7 +56,7 @@ class Fate
         @names_by_pid.delete(pid)
         @pids_by_name.delete(name)
         @threads.delete(name)
-        system "kill -s INT #{pid}"
+        system "kill -s TERM #{pid}"
         logger.info "Sent a kill signal to '#{name}' running at #{pid}"
       else
         logger.error "Could not find pid for '#{name}'"
@@ -66,25 +70,37 @@ class Fate
     def spawn(name, command)
       return Thread.new do
 
-        handler = output_handlers[name]
-        pipe = IO.popen(command, "r", :err => :out)
-        pid = pipe.pid
-        logger.info "Starting '#{name}' (pid #{pid})"
-        # First line written to STDOUT is assumed to be the service
-        # signalling that it is ready.
-        line = pipe.gets
-        logger.info "#{name} is running."
-        handler.write(line)
-
+        pipe = nil
+        pid = nil
         @mutex.synchronize do
-          @names_by_pid[pid] = name
-          @pids_by_name[name] = pid
-          @threads[name] = Thread.current
+          unless @down_in_flames
+            pipe = IO.popen(command, "r", :err => :out)
+            pid = pipe.pid
+            logger.info "Starting '#{name}' (pid #{pid})"
+
+            @names_by_pid[pid] = name
+            @pids_by_name[name] = pid
+          end
         end
 
-        IO.copy_stream(pipe, handler)
-        pid, status = Process.wait2(pid)
-        handle_child_termination(pid, status)
+        unless @down_in_flames
+          # Obtain an IO-ish object
+          handler = output_handlers[name]
+          # First line written to STDOUT is assumed to be the service
+          # signalling that it is ready.
+          line = pipe.gets
+          @mutex.synchronize do
+            unless @down_in_flames
+              logger.info "#{name} is running."
+              handler.write(line)
+            end
+          end
+          @threads[name] = Thread.current
+
+          IO.copy_stream(pipe, handler)
+          pid, status = Process.wait2(pid)
+          handle_child_termination(pid, status)
+        end
 
       end
     end
@@ -99,23 +115,20 @@ class Fate
     def handle_child_termination(pid, status)
       if name = @names_by_pid.delete(pid)
         @pids_by_name.delete(name)
-        # TODO: CLI and instantiation flags for @mode
-        if (@mode != :production) && status != 0
-          down_in_flames(name, pid, status)
-        else
-          # Probably should notify somebody somehow
-        end
+        down_in_flames(name, pid, status)
       end
     end
 
     def down_in_flames(name, pid, status)
+      @down_in_flames = true
       if status.exitstatus
         logger.error "Process '#{name}' (pid #{pid}) exited with code #{status.exitstatus}."
       else
         logger.info "Process '#{name}' (pid #{pid}) was sent signal #{status.termsig}."
       end
       logger.info "Shutting down all processes."
-      exit(1)
+
+      stop
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fate
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tool for running and interacting with a multi-process service