nsq-cluster 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea9ecab09ef0e8a1a4f7fdd3b2974d9cd4fdebaf
-  data.tar.gz: 0dfce152f7eaff2f132018b25e36be8411e8c0d6
+  metadata.gz: d5964e86f6d17a088bca32caac96fccafc557c8e
+  data.tar.gz: 2377c713fadbadaf2346bbebe2fb2d49232670bf
 SHA512:
-  metadata.gz: ee04feb92da1d0d50008527183d28df993f3651585148facd50c77a763454af276b0833aa3ec9815afd0eefab6568deddb00e962f1f1c9f364c3b4e8dfaef2f7
-  data.tar.gz: bbe511eda616cfd82a5c6d09af1be2e215e1782840f8dc46da1dd1233116e9492266f52638be46114f7beac494340616d724611002fbe3e10489d6439b664cb5
+  metadata.gz: 31dc299ac5de30c0e4603a6361431623031fa09c4050376847804f54ecabb18038eabab6d02e5c51d1585cc1fb05dbc6838f479f15237e3dbb9582f8e9dce265
+  data.tar.gz: e052bb7324161a4e08b53eca460dfa805eda5627df0de60a3e94e889a87a256e9d850d5899f2d45989021867b0bf38dfd560d4c3b3883d4310ceddfb516f97b2

data/lib/nsq-cluster.rb

@@ -11,7 +11,7 @@
 #     cluster.destroy
 #
 
-require 'socket'
+require 'net/http'
 require 'timeout'
 
 require_relative 'nsq-cluster/nsqlookupd'
@@ -19,7 +19,6 @@ require_relative 'nsq-cluster/nsqd'
 require_relative 'nsq-cluster/nsqadmin'
 
 class NsqCluster
-  PORTSCAN_INTERVAL = 0.01
   attr_reader :nsqd, :nsqlookupd, :nsqadmin
 
   def initialize(opts = {})
@@ -31,7 +30,6 @@ class NsqCluster
       nsqd_options: {},
       silent: true
     }.merge(opts)
-
     @silent = opts[:silent]
 
     @nsqlookupd = create_nsqlookupds(opts[:nsqlookupd_count], opts[:nsqdlookupd_options])
@@ -39,7 +37,7 @@ class NsqCluster
     @nsqadmin = create_nsqadmin if opts[:nsqadmin]
 
     # start everything!
-    (@nsqlookupd + @nsqd + [@nsqadmin]).compact.each { |d| d.start }
+    all_services.each { |d| d.start }
   end
 
 
@@ -89,9 +87,7 @@ class NsqCluster
     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
+        all_services.each {|service| service.block_until_running}
         puts "Cluster launched." unless @silent
       end
     rescue Timeout::Error
@@ -101,35 +97,8 @@ class NsqCluster
 
 
   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
+  def all_services
+    # nsqadmin responds to /ping as well, even though it is not documented.
+    (@nsqlookupd + @nsqd + [@nsqadmin]).compact
   end
 end

data/lib/nsq-cluster/process_wrapper.rb

@@ -1,4 +1,5 @@
 class ProcessWrapper
+  HTTPCHECK_INTERVAL = 0.01
 
 
   def initialize(opts = {})
@@ -48,5 +49,29 @@ class ProcessWrapper
     end
   end
 
-end
 
+  def block_until_running
+    if respond_to?(:http_port) && respond_to?(:host)
+      wait_for_http_port(http_port, host)
+    end
+  end
+
+
+  private
+  def wait_for_http_port(port, host)
+    port_open = false
+    until port_open do
+      begin
+        response = Net::HTTP.get_response(URI("http://#{host}:#{port}/ping"))
+        if response.is_a?(Net::HTTPSuccess)
+          port_open = true
+          puts "HTTP port #{port} responded to /ping." unless @silent
+        else
+          sleep HTTPCHECK_INTERVAL
+        end
+      rescue Errno::ECONNREFUSED
+        sleep HTTPCHECK_INTERVAL
+      end
+    end
+  end
+end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nsq-cluster
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,49 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec-rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-legacy_formatters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="