trident 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWVkOTkzYzA0Y2Y4NGJjODIzZWI2ZjJmNzExOWQ3YWUyN2I3ZDQ2OA==
+    YzQ4Zjg1MWU4YjFiMjc2Y2JiZWI0OGJkYzVlODk1NWJlOTdmNmMzNw==
   data.tar.gz: !binary |-
-    YThjMjE1Y2Q4MWM1YWRiMDI4ZWU1N2ViNzMzNjg2NWNmM2FiMjdhZA==
+    NmQwNjFjMmQ4MzM3MGFhMDM3ZDc3ZmJkMjc5MDhjNzAzZjdlNTYxNg==
 SHA512:
   metadata.gz: !binary |-
-    OWNjOTRiYWE4YTUxMmI0ZWQ0MWZhOWEyMjc0ZWM5YTgzMGYxMmRjYTM3ODI3
-    MDU4ZWZiMDY0Mzc5ZTRlMTk0ZTBiN2MwZDI0YThhZjY5MjgwZDJkMGMxNDU5
-    ZTU0NDlmMDVkMzc1OGEwOTFmMjFlMDMxZDBmODk1NWI5OTJhMTc=
+    ZDE0ZmY2MGE1ZWY5NjRiODk4ZTc3M2U0MDRmMWU5NzljNGVkNDFlNGNkMzJj
+    NWY4N2QxN2E2ODI0ODAzZGQzMDdhZTFjZmJjYmY3YTE5NjRjN2E1OWMyMzRi
+    OTUzOThmMTliMmJjM2U0M2FiZWU4MTkxNTM2MzJhNTU0ODE1OWI=
   data.tar.gz: !binary |-
-    M2E4NTFmOTc2OWFlNzg2YWZmMGY4YmViODExNGQyYmEwODNlMzY2MjgyNjlh
-    ODI5Y2IyZmIzNTg0M2ZkMzQyOWE4NjZkN2UwMjY2NWNjMmE2MzZlZDI0NjRm
-    MDc1NmYzOGYxNTU1MGIzYzJlY2MwNmVhYWZlNzBkM2NiZTliNjM=
+    MDk2YWZmYWFlNzMxZjQxOTk4YmMyNjIyMzQ5ZWVlYThiMjRiMWRkZDJkYmNh
+    MzljZjU0NDliNmQ1ZTYyMjA0ZDZiOGFhMTdkMmU3NDgzYWRjNWZmNTExNjM1
+    NjlmODkyNzUxMjhiMDU0NWM5ZDg4OGUyNjEwZTUwYmZjN2ZlZmI=

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.1 (11/20/2013)
+------------------
+
+fix race condition between start and update at startup time <2c5d4ee> [Matt Conway]
+
 0.4.0 (11/19/2013)
 ------------------
 

data/lib/trident/cli.rb

@@ -70,7 +70,6 @@ module Trident
                                            pools.values,
                                            config_hash['prefork'] == true)
       Trident::SignalHandler.start(config_hash['signals'], manager)
-      manager.start
       Trident::SignalHandler.join
     end
 

data/lib/trident/signal_handler.rb

@@ -54,11 +54,13 @@ module Trident
     def start
       setup_self_pipe
       setup_signal_handlers
+      target.start if target.respond_to?(:start)
 
       @main_loop = Thread.new do
         logger.info "Main loop started"
         loop do
           signal_result = handle_signal_queue
+          target.update if target.respond_to?(:update)
           break if signal_result == :break
           logger.debug "Snoozing main loop"
           msg = snooze if signal_queue.empty?

data/lib/trident/version.rb

@@ -1,3 +1,3 @@
 module Trident
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/test_helper.rb

@@ -93,8 +93,8 @@ class FileCounter
 
 end
 
-def wait_for(io, pattern)
-  timeout(5) do
+def wait_for(io, pattern, interval=5)
+  timeout(interval) do
     loop do
       line = io.readline
       puts line if ENV['DEBUG']

data/test/unit/trident/signal_handler_test.rb

@@ -19,24 +19,6 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
     end
   end
 
-  def do_in_child
-    read_from_child, write_from_child = IO.pipe
-
-    pid = fork do
-      read_from_child.close
-      result = yield
-      Marshal.dump(result, write_from_child)
-      exit!(0) # skips exit handlers.
-    end
-
-    [pid, read_from_child]
-    write_from_child.close
-    result = read_from_child.read
-    Process.wait(pid)
-    raise "child failed" if result.empty?
-    Marshal.load(result)
-  end
-
   context "#signal_mappings==" do
 
     should "normalize signal names" do
@@ -257,7 +239,9 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
       Process.kill("USR1", fc.pid)
 
       received = fc.wait
-      assert_equal [[:bar, [], nil], [:foo, [], nil], [:action_break, [], nil]], received
+      assert_includes received, [:bar, [], nil]
+      assert_includes received, [:foo, [], nil]
+      assert_includes received, [:action_break, [], nil]
     end
 
     should "preserve SIGCHLD behavior" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trident
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_logger