trident 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c1497896041247b078fad1afd3814676a75819c7
-  data.tar.gz: 7fc6cc36f0a02b4088270ed5466e67d2f33b8bdd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDdmMDA1Y2YzMDI4YzcyM2VkZDIyNmNjZTViYzVjZWJiZDAyNzE1Yw==
+  data.tar.gz: !binary |-
+    NDUxYTk3ZGE5ZTRjZWNhZDVkMmEwYWY4Yjg5NTFhOTBiYWQyMjg4Ng==
 SHA512:
-  metadata.gz: c462d1e488d09b3779dee1c44a378aaf65ea41f8b283fe98fcf091d1e351dd6a8150ff11e61bf26396f110de13b718d39db3d31c4da1eb0b584daf5201172fb6
-  data.tar.gz: a2686b40f96950edc600388daa311487c08f932666524b4c050b2bd9cfd70ae5ed6baa0f3217b26fd8c15d82e262343aa7d78c6ef60f9dfafdf562d0157ba659
+  metadata.gz: !binary |-
+    OWRhNzgzNzY4ODZkZDZjZGU1ZmZlMzQxMTA5ZGFmNDUyMjA4Yjc4YzMxNmFm
+    OTg4Y2VkNTdkZjU0MmM2ODc1NjRhNjM3ZWJiOWZiN2EzMzc2NDY0ZWU3NmY3
+    MjYxYmY5YWQ4ZjZjY2Y2M2MzNjA1OWFkNGJiNTI1MGU4ZDlkYTY=
+  data.tar.gz: !binary |-
+    ZjE0YzhiYzU0OWRjN2M3NTE0ZmIyMzBiNmJiNzI2ZGM2ODk2NjVjZjRlZDAy
+    MjEwNTc5MmQ2ZWVkNTdiNWYyYTRmYzEyNzcyMmY4YWFkNTMxMjliZTc3ZTQ3
+    MjZkZjFlOWQ0MzZhZWI5NWQ3NjUyMTdkYTZiMzMyYTE5M2QwZmU=

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.3.0 (11/19/2013)
+------------------
+
+fix race condition on startup for installing signal handlers before fork tries to reset them <dab3f0f> [Matt Conway]
+fix require needed for 1.9.3 <7230dfc> [Matt Conway]
+
 0.2.0 (11/18/2013)
 ------------------
 

data/README.md

@@ -36,3 +36,4 @@ See other command line options with
 
 * Add support for reloading the trident config with a HUP signal
 * Add support in yml for specifying [process limits](http://www.ruby-doc.org/core-1.9.3/Process.html#method-c-setrlimit) (memory especially)
+* Add ability to track pool processes across a restart (or maybe only across a HUP) - allows a restart to spin up new processes as old ones die off gracefully.

data/lib/trident/cli.rb

@@ -69,9 +69,9 @@ module Trident
       manager = Trident::PoolManager.new(config_hash['application'],
                                            pools.values,
                                            config_hash['prefork'] == true)
-      sh_thread = Thread.new { Trident::SignalHandler.start(config_hash['signals'], manager) }
+      Trident::SignalHandler.start(config_hash['signals'], manager)
       manager.start
-      sh_thread.join
+      Trident::SignalHandler.join
     end
 
     private

data/lib/trident/signal_handler.rb

@@ -1,3 +1,5 @@
+require 'fcntl'
+
 module Trident
   class SignalHandler
     include GemLogger::LoggerSupport
@@ -24,6 +26,12 @@ module Trident
         self.instance = nil
       end
 
+      def join
+        raise "No signal handler started" unless instance
+        logger.info "Joining on signal handler"
+        instance.join
+      end
+
       def reset_for_fork
         raise "No signal handler started" unless instance
         instance.reset_for_fork
@@ -39,6 +47,7 @@ module Trident
       @signal_queue = []
       @self_pipe = []
       @original_signal_handlers = {}
+      @main_loop = nil
       self.signal_mappings = signal_mappings
     end
 
@@ -46,16 +55,18 @@ module Trident
       setup_self_pipe
       setup_signal_handlers
 
-      logger.info "Main loop started"
-      loop do
-        signal_result = handle_signal_queue
-        break if signal_result == :break
-        logger.debug "Snoozing main loop"
-        msg = snooze if signal_queue.empty?
-        logger.debug "Main loop awakened: #{msg.inspect}"
-        break if msg == MSG_STOP
+      @main_loop = Thread.new do
+        logger.info "Main loop started"
+        loop do
+          signal_result = handle_signal_queue
+          break if signal_result == :break
+          logger.debug "Snoozing main loop"
+          msg = snooze if signal_queue.empty?
+          logger.debug "Main loop awakened: #{msg.inspect}"
+          break if msg == MSG_STOP
+        end
+        logger.info "Main loop exited"
       end
-      logger.info "Main loop exited"
     end
 
     def stop
@@ -63,6 +74,10 @@ module Trident
       wakeup(MSG_STOP)
     end
 
+    def join
+      @main_loop.join
+    end
+
     def reset_for_fork
       @self_pipe = []
       reset_signal_handlers

data/lib/trident/version.rb

@@ -1,3 +1,3 @@
 module Trident
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/test_helper.rb

@@ -103,23 +103,31 @@ def wait_for(io, pattern)
   end
 end
 
-def child_processes(pid=Process.pid)
+def child_processes(root_pid=Process.pid)
   processes = {}
-  lines = `pstree -w #{pid}`.lines.to_a
-  #  lines = `ps -g #{pid} -opid,command`.lines.to_a
-  lines.shift # get rid of header
+  relations = {}
+  lines = `ps -e -o pid,ppid,command`.lines.to_a
+  lines.shift # remove header
   lines.each do |line|
-    pieces = line.scan(/\A[^\d]*(\d+) \w+ (.*)\Z/).first
-    pid = pieces.shift
-    pid = pid.to_i
-    raise "Failed to extract pid: #{line} - #{pieces}" if pid == 0
-    next if pid == Process.pid
+    line.chomp!
+    pieces = line.scan(/(\d+)\s+(\d+)\s+(.*)/).first
+    pid = pieces[0].to_i
+    ppid = pieces[1].to_i
+    command = pieces[2].strip
 
-    command = pieces.shift.strip
     next if command =~ /^ps/
+
     processes[pid] = command
+    relations[ppid] ||= []
+    relations[ppid] << pid
+  end
+
+  pids = Array(relations[root_pid])
+  pids.each do |pid|
+    pids.concat(Array(relations[pid]))
   end
-  processes
+
+  processes.select {|k, v| pids.include?(k) }
 end
 
 def kill_all_child_processes

data/test/unit/trident/cli_test.rb

@@ -249,6 +249,7 @@ class Trident::CLITest < MiniTest::Should::TestCase
     should "run if given logfile and pidfile when daemonizing" do
 
       Trident::SignalHandler.expects(:start).once
+      Trident::SignalHandler.expects(:join).once
       Trident::Pool.any_instance.stubs(:fork)
       Trident::CLI.any_instance.expects(:daemonize).once
 

data/test/unit/trident/signal_handler_test.rb

@@ -188,12 +188,13 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
 
   end
 
-  context "#start/stop" do
+  context "#start/stop/join" do
 
     should "block until woken" do
       handler = SignalHandler.new({}, Target.new)
       handler.stubs(:trap)
-      thread = Thread.new { handler.start }
+      handler.start
+      thread = Thread.new { handler.join }
       sleep 0.1
       assert thread.alive?
       handler.stop
@@ -221,12 +222,22 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
 
   end
 
+  context ".join" do
+
+    should "fail if already instantiated" do
+      SignalHandler.instance = nil
+      assert_raises(RuntimeError) { SignalHandler.join }
+    end
+
+  end
+
   context "api" do
 
     should "react to signals" do
       fc = ForkChild.new do
         target = Target.new
         SignalHandler.start({"int" => "foo", "term" => "bar", "usr1" => "action_break"}, target)
+        SignalHandler.join
         target.received
       end
 
@@ -246,6 +257,7 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
         $stderr.reopen("/dev/null")
         target = Target.new
         SignalHandler.start({"int" => "foo", "term" => "bar", "usr1" => "action_break"}, target)
+        SignalHandler.join
         target.received
       end
       sleep 0.1

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: trident
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,56 +56,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest_should
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Manages pools of forked ruby processes
@@ -156,17 +156,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Manages pools of forked ruby processes
@@ -181,4 +181,3 @@ test_files:
 - test/unit/trident/pool_test.rb
 - test/unit/trident/signal_handler_test.rb
 - test/unit/trident/utils_test.rb
-has_rdoc: