nsq-cluster 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb2f06489d4c76e38f2dbf70297322f3a715e0ef
-  data.tar.gz: 601c63715a0a16028dae656bdf3e8da83cb6df7f
+  metadata.gz: ea9ecab09ef0e8a1a4f7fdd3b2974d9cd4fdebaf
+  data.tar.gz: 0dfce152f7eaff2f132018b25e36be8411e8c0d6
 SHA512:
-  metadata.gz: 8564b8c8a1215bacee880cf3c4ae0f8799e4b2bad7fa2cba869b44ed5d6c7233e0d1df3efdaaa4fed84722926128880c70dd3b4d4c2a321e745a0e1cb4fe7036
-  data.tar.gz: 7366cc51ba05e8ad2e6402a1bc5446d62d159b5702d68189f7fb0202ff4e6f8e0ec5c73158c19e400ae9d4df54d285d6e974b64b22557245c167a67c508e7136
+  metadata.gz: ee04feb92da1d0d50008527183d28df993f3651585148facd50c77a763454af276b0833aa3ec9815afd0eefab6568deddb00e962f1f1c9f364c3b4e8dfaef2f7
+  data.tar.gz: bbe511eda616cfd82a5c6d09af1be2e215e1782840f8dc46da1dd1233116e9492266f52638be46114f7beac494340616d724611002fbe3e10489d6439b664cb5

data/README.md

@@ -6,6 +6,9 @@ Easily start up a local NSQ cluster. This is great for testing.
 # Start a cluster of 3 nsqd's and 2 nsqlookupd's
 cluster = NsqCluster.new(nsqd_count: 3, nsqlookupd_count: 2)
 
+# Optionaally, block until the cluster is up and running
+cluster.block_until_running
+
 # Stop the 3rd nsqd instance
 cluster.nsqd.last.stop
 

data/bin/nsq-cluster

@@ -24,9 +24,8 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-print 'Starting cluster ... '
 cluster = NsqCluster.new(options)
-puts 'started'
+cluster.block_until_running
 
 Signal.trap('INT') do
   print 'Shutting down ... '

data/lib/nsq-cluster.rb

@@ -11,12 +11,15 @@
 #     cluster.destroy
 #
 
+require 'socket'
+require 'timeout'
+
 require_relative 'nsq-cluster/nsqlookupd'
 require_relative 'nsq-cluster/nsqd'
 require_relative 'nsq-cluster/nsqadmin'
 
 class NsqCluster
-
+  PORTSCAN_INTERVAL = 0.01
   attr_reader :nsqd, :nsqlookupd, :nsqadmin
 
   def initialize(opts = {})
@@ -81,4 +84,52 @@ class NsqCluster
     @nsqlookupd.map { |lookupd| "http://#{lookupd.host}:#{lookupd.http_port}" }
   end
 
+
+  def block_until_running(timeout = 3)
+    puts "Waiting for cluster to launch..." unless @silent
+    begin
+      Timeout::timeout(timeout) do
+        service_ports.each do |port, protocol|
+          wait_for_port(port, protocol)
+        end
+        puts "Cluster launched." unless @silent
+      end
+    rescue Timeout::Error
+      puts "ERROR: Cluster did not fully launch within #{timeout} seconds."
+    end
+  end
+
+
+  private
+  def service_ports
+    ports = {}
+    ports[nsqadmin.http_port] = :http if nsqadmin
+    nsqlookupd.each do |n|
+      ports[n.tcp_port] = :tcp
+      ports[n.http_port] = :http
+    end
+    nsqd.each do |n|
+      ports[n.tcp_port] = :tcp
+      ports[n.http_port] = :http
+    end
+    ports
+  end
+
+
+  def wait_for_port(port, protocol)
+    port_open = false
+    until port_open do
+      begin
+        sock = TCPSocket.new('127.0.0.1', port)
+        port_open = true
+        puts "#{protocol.to_s.upcase} port #{port} open." unless @silent
+        if protocol == :tcp
+          puts "You may safely ignore: 'ERROR: failed to read protocol version - EOF'" unless @silent
+        end
+        sock.close
+      rescue Errno::ECONNREFUSED
+      end
+      sleep PORTSCAN_INTERVAL if !port_open
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Wistia