nsq-cluster 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c7c5f98ff83cca318e2639e007161bd439b2316
-  data.tar.gz: d7af273c0b9f9e74b700fd5a3fb22c676fdbccb9
+  metadata.gz: 9c0bd6539d3271fa6911e7eb433dd42654c823d4
+  data.tar.gz: '08bd687fbf33c404332e8e35397298281f3e1421'
 SHA512:
-  metadata.gz: 11b7c8b3a6db1d70e72cd20117d5987bc2e880eac5f9783eae0bcceaa127e943f71cf771458ac9935012560674172879328a678b6398402b0fd4440a2d786488
-  data.tar.gz: cb329273e0e9e6fbba661aebc397270c2e1f4eb4406f7a076f643c166d1ebfbf83479fe91715a321d2d8e6d03adf89e1c35c56b4eaf18b4a7fcf6e472db3a881
+  metadata.gz: 6503b58025c3130da593fd7a3764126dfe72eb0ab0893b69d387617c3d405cd91507414e4c06f8646280ab9d239ef8173a915533bd9317068f86b043f9f129d6
+  data.tar.gz: e08ee4e576dd6543dfcb1b9f1b39b3b90233a0e1e54628d45d917c910eb519440c2c92be5def920b7f1f9079725ebbdd8917071e57065af2fafcab9dcb9da343

data/README.md

@@ -17,11 +17,6 @@ cluster.nsqd.last.start
 cluster.destroy
 ```
 
-## Compatibility
-
-- Version 2.x of `nsq-cluster` is compatible with NSQ >= 1.0.
-- Version 1.x of `nsq-cluster` is compatible with NSQ < 1.0.
-
 ## Flags for nsqd and nsqlookupd
 
 Optionally, you can pass in flags for nsqd and nsqlookupd like this:

data/lib/nsq-cluster/nsqd.rb

@@ -8,6 +8,13 @@ class Nsqd < ProcessWrapper
 
   attr_reader :host, :tcp_port, :http_port, :id, :base_port
 
+  # Returns true if nsqd's version is < 1.0
+  def self.version_is_pre_1?
+    @version_is_pre_1 ||= (
+      `nsqd -version`.index('nsqd v0') == 0
+    )
+  end
+
 
   def initialize(opts = {}, verbose = false)
     super
@@ -49,15 +56,20 @@ class Nsqd < ProcessWrapper
       %Q(--tcp-address=#{@host}:#{@tcp_port}),
       %Q(--http-address=#{@host}:#{@http_port}),
       %Q(--data-path=#{data_path}),
-      %Q(--node-id=#{id}),
       %Q(--broadcast-address=#{@broadcast_address})
     ]
 
+    if Nsqd.version_is_pre_1?
+      node_args = [%Q(--worker-id=#{id})]
+    else
+      node_args = [%Q(--node-id=#{id})]
+    end
+
     lookupd_args = @lookupd.map do |ld|
       %Q(--lookupd-tcp-address=#{ld.host}:#{ld.tcp_port})
     end
 
-    base_args + @extra_args + lookupd_args
+    base_args + node_args + @extra_args + lookupd_args
   end
 
 

data/lib/nsq-cluster/nsqlookupd.rb

@@ -87,9 +87,9 @@ class Nsqlookupd < ProcessWrapper
 
   def nsqlookupd_post(action, params)
     if params[:topic] && params[:channel]
-      post "channel/#{action}", topic: params[:topic], channel: params[:channel]
+      post "#{action}_channel", topic: params[:topic], channel: params[:channel]
     elsif params[:topic]
-      post "topic/#{action}", topic: params[:topic]
+      post "#{action}_topic", topic: params[:topic]
     else
       raise 'you must specify a topic or topic and channel'
     end

metadata

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