nsq-ruby 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784760540970f7a72dc0e168f3727221b82ca214
-  data.tar.gz: 533cfa8fd3dadb9dde8c6ee25aff6ef6eac8d50c
+  metadata.gz: 9dc9c8d48a3ec617bbae37bb043f7450a8206ce1
+  data.tar.gz: 28111fd4130fd0173b978648e88c68793217976a
 SHA512:
-  metadata.gz: f0298fa85dd7a438539770e5e3d14c5f96d0003892c28ac675fd62042cdf80c712c35cefa8d78d52d432659e9d0432a737daa44197f257c273ea281c384f6f9e
-  data.tar.gz: 5abe4bde5bbacb4a9ccb96efc948370afd9902094ce4432d762dffd62fbfab78b28ee6445869c5789f03d5ca888396b7b8b49d0fd1a5bdb0596c73461f03d97a
+  metadata.gz: b01f2ffb835a61b597493da03b97e739e5991990bf715dfcf2711bcd5228c0335c6ef207a5678c88719e58397c19ab0b76800725037c2e42630409ebd3ef797d
+  data.tar.gz: 5659f9c7ae6e22223eabf9358e3f146fac66bd741945b8f914cd78c477d81f13d02a8e349a438c3b6085eb551540bcc9f81a008d92b5a6fb4a4b81980f44f9eb

data/README.md

@@ -102,7 +102,9 @@ producer = Nsq::Producer.new(
   tls_v1: true,
   tls_options: {
     key: '/path/to/ssl/key.pem',
-    certificate: '/path/to/ssl/certificate.pem'
+    certificate: '/path/to/ssl/certificate.pem',
+    ca_certificate: '/path/to/ssl/ca_certificate.pem',
+    verify_mode: OpenSSL::SSL::VERIFY_PEER
   }
 )
 ```
@@ -200,7 +202,9 @@ consumer = Nsq::Consumer.new(
   tls_v1: true,
   tls_options: {
     key: '/path/to/ssl/key.pem',
-    certificate: '/path/to/ssl/certificate.pem'
+    certificate: '/path/to/ssl/certificate.pem',
+    ca_certificate: '/path/to/ssl/ca_certificate.pem',
+    verify_mode: OpenSSL::SSL::VERIFY_PEER
   }
 )
 ```

data/lib/nsq/connection.rb

@@ -266,19 +266,20 @@ module Nsq
 
 
     def stop_write_loop
-      @stop_write_loop = true
-      @write_loop_thread.join(1) if @write_loop_thread
+      if @write_loop_thread
+        @write_queue.push(:stop_write_loop)
+        @write_loop_thread.join
+      end
       @write_loop_thread = nil
     end
 
 
     def write_loop
-      @stop_write_loop = false
       data = nil
       loop do
         data = @write_queue.pop
+        break if data == :stop_write_loop
         write_to_socket(data)
-        break if @stop_write_loop && @write_queue.size == 0
       end
     rescue Exception => ex
       # requeue PUB and MPUB commands
@@ -383,8 +384,9 @@ module Nsq
       context.cert = OpenSSL::X509::Certificate.new(File.read(@tls_options[:certificate]))
       context.key = OpenSSL::PKey::RSA.new(File.read(@tls_options[:key]))
       if @tls_options[:ca_certificate]
-        context.ca_file = OpenSSL::X509::Certificate.new(File.read(@tls_options[:ca_certificate])).to_pem
+        context.ca_file = @tls_options[:ca_certificate]
       end
+      context.verify_mode = @tls_options[:verify_mode] || OpenSSL::SSL::VERIFY_NONE
       context
     end
 

data/lib/version.rb

@@ -2,7 +2,7 @@ module Nsq
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsq-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler