nsq-cluster 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912e82c06fc1606ed7a0c6cfcef965b7c150db75
-  data.tar.gz: 73cbfdcfa92085899ade4fd397a3d12c4477d043
+  metadata.gz: b6b7eaacf056401979d86350a7fe6671ac938e69
+  data.tar.gz: 8ef918b8ead29882028f73f38fbf746bdddb306c
 SHA512:
-  metadata.gz: 63c76b46b7f9d20c8e75e018f8514f5d5f713ea4d0467123a9c0cfa33ae76eaeb777d2529b5ea0fb59275c440fa323cc7c1c672fe80616804f8604731f5ae870
-  data.tar.gz: 9802793529d7d68b1814204e2d31213ba25c6a473e64a897e36d08aba79318960d1efeac63fb3c9dba8b9e234765ecaa50606db52548fffe987f5f422466a0fd
+  metadata.gz: b75e759f4ac438a3d8dfb02f06a9770eb55422298ac4f399f39496841b194a9d6ef07d4da5e788b95fc8a39b34e4dc6f574e0fa4454891140fcea43784fd05f9
+  data.tar.gz: 0195b5c6014f498a8eacdc118e0aebabba95a92ed68b6dc1f72b29cc503baf535b80d5c7e7b89543c38cd58b3bcb2c5ff47da4a51a72e7e59ee3ce94c51f7f8e

data/bin/nsq-cluster

@@ -9,7 +9,9 @@ options = {
   nsqd_count: 1,
   nsqlookupd_count: 1,
   nsqadmin: true,
-  verbose: true
+  verbose: true,
+  nsqd_options: { base_port: 4150 },
+  nsqlookupd_options: { base_port: 4160 }
 }
 
 OptionParser.new do |opts|

data/lib/nsq-cluster/nsqd.rb

@@ -6,7 +6,7 @@ class Nsqd < ProcessWrapper
   include HTTPWrapper
 
 
-  attr_reader :host, :tcp_port, :http_port, :id
+  attr_reader :host, :tcp_port, :http_port, :id, :base_port
 
 
   def initialize(opts = {}, verbose = false)
@@ -14,8 +14,13 @@ class Nsqd < ProcessWrapper
 
     @id = opts.delete(:id) || 0
     @host = opts.delete(:host) || '127.0.0.1'
-    @tcp_port = opts.delete(:tcp_port) || (4150 + @id * 2)
-    @http_port = opts.delete(:http_port) || (4151 + @id * 2)
+
+    # Use a non-standard nsqd port by default so as to not conflict with any
+    # local instances. This is helpful when running tests!
+    @base_port = opts.delete(:base_port) || 4250
+
+    @tcp_port = opts.delete(:tcp_port) || (@base_port + @id * 2)
+    @http_port = opts.delete(:http_port) || (@base_port + 1 + @id * 2)
     @lookupd = opts.delete(:nsqlookupd) || []
     @broadcast_address = opts.delete(:broadcast_address) || @host
 

data/lib/nsq-cluster/nsqlookupd.rb

@@ -4,15 +4,20 @@ require_relative 'http_wrapper'
 class Nsqlookupd < ProcessWrapper
   include HTTPWrapper
 
-  attr_reader :host, :tcp_port, :http_port
+  attr_reader :host, :tcp_port, :http_port, :base_port
 
   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 + @id * 2)
-    @http_port = opts.delete(:http_port) || (4161 + @id * 2)
+
+    # Use a non-standard nsqlookupd port by default so as to not conflict with
+    # any local instances. This is helpful when running tests!
+    @base_port = opts.delete(:base_port) || 4360
+
+    @tcp_port = opts.delete(:tcp_port) || (@base_port + @id * 2)
+    @http_port = opts.delete(:http_port) || (@base_port + 1 + @id * 2)
     @broadcast_address = opts.delete(:broadcast_address) || @host
 
     @extra_args = opts.map do |key, value|

metadata

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