nsq-cluster 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbeebffe7f886384eb99c3c7bbb3a07a66dfb58
-  data.tar.gz: ef5db16daa418743ba8b9e32c3529cfc526b017b
+  metadata.gz: 912e82c06fc1606ed7a0c6cfcef965b7c150db75
+  data.tar.gz: 73cbfdcfa92085899ade4fd397a3d12c4477d043
 SHA512:
-  metadata.gz: 298fd3698cc0d43ec147f2740c88ec68c4c5c0fc19c3c180440d65dcce4777a6177b38247da7429cecba540a5a17c7c4a35d02afb34a2a49630fed193bec5fbc
-  data.tar.gz: 22ffb6980ead07c4397e4116fb54606a5a8df284989ee247bf80f7959c358d5598546ec23de6dca8bae76d3dfe10a2263b55d66856f26fed9e74474121775de9
+  metadata.gz: 63c76b46b7f9d20c8e75e018f8514f5d5f713ea4d0467123a9c0cfa33ae76eaeb777d2529b5ea0fb59275c440fa323cc7c1c672fe80616804f8604731f5ae870
+  data.tar.gz: 9802793529d7d68b1814204e2d31213ba25c6a473e64a897e36d08aba79318960d1efeac63fb3c9dba8b9e234765ecaa50606db52548fffe987f5f422466a0fd

data/README.md

@@ -3,22 +3,17 @@
 Easily start up a local NSQ cluster. This is great for testing.
 
 ```ruby
-# Start a cluster of 3 nsqd's and 2 nsqlookupd's
+# Start a cluster of 3 nsqd's and 2 nsqlookupd's.
+# This will block execution until all components are fully up and running.
 cluster = NsqCluster.new(nsqd_count: 3, nsqlookupd_count: 2)
 
-# Optionally, block until the cluster is up and running
-cluster.block_until_running
-
-# Stop the 3rd nsqd instance
+# Stop the 3rd nsqd instance and wait for it to come down.
 cluster.nsqd.last.stop
 
-# Wait until it's stopped
-cluster.nsqd.last.block_until_stopped
-
-# Start it back up again
+# Start it back up again and wait for it to fully start.
 cluster.nsqd.last.start
 
-# Tear down the whole cluster
+# Tear down the whole cluster.
 cluster.destroy
 ```
 

data/lib/nsq-cluster.rb

@@ -38,7 +38,10 @@ class NsqCluster
 
     begin
       # start everything!
-      all_services.each { |d| d.start }
+      all_services.each{|d| d.start(async: true)}
+
+      # by default, block execution until everything is started
+      block_until_running unless opts[:async]
     rescue Exception => ex
       # if we hit an error, stop everything that we started
       destroy
@@ -51,8 +54,7 @@ class NsqCluster
     (0...count).map do |idx|
       Nsqlookupd.new(
         options.merge({
-          tcp_port: 4160 + idx * 2,
-          http_port: 4161 + idx * 2
+          id: idx
         }),
         @verbose
       )
@@ -64,9 +66,8 @@ class NsqCluster
     (0...count).map do |idx|
       Nsqd.new(
         options.merge({
-          tcp_port: 4150 + idx * 2,
-          http_port: 4151 + idx * 2,
-          nsqlookupd: @nsqlookupd,
+          id: idx,
+          nsqlookupd: @nsqlookupd
         }),
         @verbose
       )

data/lib/nsq-cluster/nsqadmin.rb

@@ -19,7 +19,7 @@ class Nsqadmin < ProcessWrapper
   end
 
 
-  def stop
+  def stop(opts = {})
     Sys::ProcTable.ps.select{|pe| pe.ppid == @pid}.each do |child_pid|
       Process.kill('TERM', child_pid)
     end

data/lib/nsq-cluster/nsqd.rb

@@ -6,15 +6,16 @@ class Nsqd < ProcessWrapper
   include HTTPWrapper
 
 
-  attr_reader :host, :tcp_port, :http_port
+  attr_reader :host, :tcp_port, :http_port, :id
 
 
   def initialize(opts = {}, verbose = false)
     super
 
+    @id = opts.delete(:id) || 0
     @host = opts.delete(:host) || '127.0.0.1'
-    @tcp_port = opts.delete(:tcp_port) || 4150
-    @http_port = opts.delete(:http_port) || 4151
+    @tcp_port = opts.delete(:tcp_port) || (4150 + @id * 2)
+    @http_port = opts.delete(:http_port) || (4151 + @id * 2)
     @lookupd = opts.delete(:nsqlookupd) || []
     @broadcast_address = opts.delete(:broadcast_address) || @host
 
@@ -43,7 +44,7 @@ class Nsqd < ProcessWrapper
       %Q(--tcp-address=#{@host}:#{@tcp_port}),
       %Q(--http-address=#{@host}:#{@http_port}),
       %Q(--data-path=#{data_path}),
-      %Q(--worker-id=#{worker_id}),
+      %Q(--worker-id=#{id}),
       %Q(--broadcast-address=#{@broadcast_address})
     ]
 
@@ -55,14 +56,9 @@ class Nsqd < ProcessWrapper
   end
 
 
-  def worker_id
-    @tcp_port
-  end
-
-
   # find or create a temporary data directory for this instance
   def data_path
-    "/tmp/nsqd-#{worker_id}"
+    "/tmp/nsqd-#{id}"
   end
 
 

data/lib/nsq-cluster/nsqlookupd.rb

@@ -9,9 +9,10 @@ class Nsqlookupd < ProcessWrapper
   def initialize(opts = {}, verbose = false)
     super
 
+    @id = opts.delete(:id) || 0
     @host = opts.delete(:host) || '127.0.0.1'
-    @tcp_port = opts.delete(:tcp_port) || 4160
-    @http_port = opts.delete(:http_port) || 4161
+    @tcp_port = opts.delete(:tcp_port) || (4160 + @id * 2)
+    @http_port = opts.delete(:http_port) || (4161 + @id * 2)
     @broadcast_address = opts.delete(:broadcast_address) || @host
 
     @extra_args = opts.map do |key, value|

data/lib/nsq-cluster/process_wrapper.rb

@@ -8,22 +8,24 @@ class ProcessWrapper
   end
 
 
-  def start
+  def start(opts = {})
     raise "#{command} is already running" if running? || another_instance_is_running?
     @pid = spawn(command, *args, [:out, :err] => output)
+    block_until_running unless opts[:async]
   end
 
 
-  def stop
+  def stop(opts = {})
     raise "#{command} is not running" unless running?
     Process.kill('TERM', @pid)
     Process.waitpid(@pid)
     @pid = nil
+    block_until_stopped unless opts[:async]
   end
 
 
   def destroy
-    stop if running?
+    stop(async: true) if running?
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable