nsq-cluster 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b0210ee2dd176e7c365d50c306c1882a5f93c7b
-  data.tar.gz: 46e60982e791fa040eae65148ba328776c231665
+  metadata.gz: b47dc619bd8a8ea2247893e68b3da23c6303b1f7
+  data.tar.gz: 852cfe562564cd6b793576ee17840e7b0de1e35b
 SHA512:
-  metadata.gz: 85b1965782495a9c16197da9429545adeeeb74ed6f4109132a0b79a1369fd1863e753edc67ffc3e416875d64fa893dda1bb68708d06b9f528c2be56277ca1e03
-  data.tar.gz: 56927a22f30067f85320cdd988a69cbfd7d368b9910486255ede412c2e0c8c967220553c81fdce43e52f0f56395bb431ee1d496b10176de506e592b1ea0ae25f
+  metadata.gz: a7306f2913bfd847d960f1cab03918ab57a6cdc21a84f6c3adecdac7d2dc59416650c244c21d5e4e77fd42ddc2634bf647b9d503e85fda716d74592adf144f09
+  data.tar.gz: 1f886a10b6cc6a8ecedf32c38b4b196ca9e297cf29e42ddaec22dba1e98d1c90681b1fa531b8bcacbda019e81f8b6e6815b6264f8862520f94adb493a22d3707

data/lib/nsq-cluster.rb

@@ -36,8 +36,14 @@ class NsqCluster
     @nsqd = create_nsqds(opts[:nsqd_count], opts[:nsqd_options])
     @nsqadmin = create_nsqadmin if opts[:nsqadmin]
 
-    # start everything!
-    all_services.each { |d| d.start }
+    begin
+      # start everything!
+      all_services.each { |d| d.start }
+    rescue Exception => ex
+      # if we hit an error, stop everything that we started
+      destroy
+      raise ex
+    end
   end
 
 

data/lib/nsq-cluster/process_wrapper.rb

@@ -8,7 +8,7 @@ class ProcessWrapper
 
 
   def start
-    raise "#{command} is already running" if running?
+    raise "#{command} is already running" if running? || another_instance_is_running?
     @pid = spawn(command, *args, [:out, :err] => output)
   end
 
@@ -31,6 +31,15 @@ class ProcessWrapper
   end
 
 
+  def another_instance_is_running?
+    if respond_to?(:http_port)
+      http_port_open?
+    else
+      false
+    end
+  end
+
+
   def command
     raise 'you have to override this in a subclass, hotshot'
   end
@@ -52,7 +61,7 @@ class ProcessWrapper
 
   def block_until_running
     if respond_to?(:http_port) && respond_to?(:host)
-      wait_for_http_port(http_port, host)
+      wait_for_http_port
     else
       raise "Can't block without http port and host"
     end
@@ -61,7 +70,7 @@ class ProcessWrapper
 
   def block_until_stopped
     if respond_to?(:http_port) && respond_to?(:host)
-      wait_for_no_http_port(http_port, host)
+      wait_for_no_http_port
     else
       raise "Can't block without http port and host"
     end
@@ -69,34 +78,33 @@ class ProcessWrapper
 
 
   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
+  def wait_for_http_port
+    until http_port_open? do
+      sleep HTTPCHECK_INTERVAL
     end
+    puts "HTTP port #{http_port} responded to /ping." unless @silent
   end
 
 
-  def wait_for_no_http_port(port, host)
-    port_closed = false
-    until port_closed do
-      begin
-        Net::HTTP.get_response(URI("http://#{host}:#{port}/ping"))
-        sleep HTTPCHECK_INTERVAL
-      rescue Errno::ECONNREFUSED
-        puts "HTTP port #{port} stopped responding to /ping." unless @silent
-        port_closed = true
+  def wait_for_no_http_port
+    until !http_port_open? do
+      sleep HTTPCHECK_INTERVAL
+    end
+    puts "HTTP port #{http_port} stopped responding to /ping." unless @silent
+  end
+
+
+  def http_port_open?
+    begin
+      response = Net::HTTP.get_response(URI("http://#{host}:#{http_port}/ping"))
+      if response.is_a?(Net::HTTPSuccess)
+        true
+      else
+        false
       end
+    rescue Errno::ECONNREFUSED
+      false
     end
   end
+
 end

metadata

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