nsq-cluster 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407a8edf0a722a04596027ceb17c4d40f8aac645
-  data.tar.gz: 7d8dceffa67428857cc8b976237669cd6ea8767a
+  metadata.gz: 2b0210ee2dd176e7c365d50c306c1882a5f93c7b
+  data.tar.gz: 46e60982e791fa040eae65148ba328776c231665
 SHA512:
-  metadata.gz: f490a6fff8299fc87ea9c326620c4cdf92bb1882a145903a4ae7e453e9a8148e9e204229719d220b8477e0974f243719f4e9edae104d7ca0fce6df9ad6706a51
-  data.tar.gz: f0b4e52afbac781ae6f7ff97d3f9c3cb7cbee108b74df63d631fc44ac46bce95321142e8d42e34d9deb7b897f39bb51d0209c13da9573e9ca337275ca8be50c5
+  metadata.gz: 85b1965782495a9c16197da9429545adeeeb74ed6f4109132a0b79a1369fd1863e753edc67ffc3e416875d64fa893dda1bb68708d06b9f528c2be56277ca1e03
+  data.tar.gz: 56927a22f30067f85320cdd988a69cbfd7d368b9910486255ede412c2e0c8c967220553c81fdce43e52f0f56395bb431ee1d496b10176de506e592b1ea0ae25f

data/bin/nsq-cluster

@@ -30,6 +30,7 @@ cluster.block_until_running
 Signal.trap('INT') do
   print 'Shutting down ... '
   cluster.destroy
+  cluster.block_until_stopped
   puts 'done'
   exit
 end

data/lib/nsq-cluster/nsqadmin.rb

@@ -1,3 +1,5 @@
+require 'sys/proctable'
+
 require_relative 'process_wrapper'
 
 class Nsqadmin < ProcessWrapper
@@ -13,6 +15,14 @@ class Nsqadmin < ProcessWrapper
   end
 
 
+  def stop
+    Sys::ProcTable.ps.select{|pe| pe.ppid == @pid}.each do |child_pid|
+      Process.kill('TERM', child_pid)
+    end
+    super
+  end
+
+
   def command
     'nsqadmin'
   end

data/lib/nsq-cluster/process_wrapper.rb

@@ -53,6 +53,17 @@ class ProcessWrapper
   def block_until_running
     if respond_to?(:http_port) && respond_to?(:host)
       wait_for_http_port(http_port, host)
+    else
+      raise "Can't block without http port and host"
+    end
+  end
+
+
+  def block_until_stopped
+    if respond_to?(:http_port) && respond_to?(:host)
+      wait_for_no_http_port(http_port, host)
+    else
+      raise "Can't block without http port and host"
     end
   end
 
@@ -74,4 +85,18 @@ class ProcessWrapper
       end
     end
   end
+
+
+  def wait_for_no_http_port(port, host)
+    port_closed = false
+    until port_closed do
+      begin
+        Net::HTTP.get_response(URI("http://#{host}:#{port}/ping"))
+        sleep HTTPCHECK_INTERVAL
+      rescue Errno::ECONNREFUSED
+        puts "HTTP port #{port} stopped responding to /ping." unless @silent
+        port_closed = true
+      end
+    end
+  end
 end

data/lib/nsq-cluster.rb

@@ -73,7 +73,7 @@ class NsqCluster
 
 
   def destroy
-    (@nsqd + @nsqlookupd).each { |d| d.destroy }
+    all_services.each{|s| s.destroy}
   end
 
 
@@ -91,7 +91,20 @@ class NsqCluster
         puts "Cluster launched." unless @silent
       end
     rescue Timeout::Error
-      puts "ERROR: Cluster did not fully launch within #{timeout} seconds."
+      raise "Cluster did not fully launch within #{timeout} seconds."
+    end
+  end
+
+
+  def block_until_stopped(timeout = 10)
+    puts "Waiting for cluster to stop..." unless @silent
+    begin
+      Timeout::timeout(timeout) do
+        all_services.each{|service| service.block_until_stopped}
+        puts "Cluster stopped." unless @silent
+      end
+    rescue Timeout::Error
+      raise "Cluster did not fully stop within #{timeout} seconds."
     end
   end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  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: fakeweb
   requirement: !ruby/object:Gem::Requirement